Merge branch 'master' into feature/gollum-lib

Conflicts:
	lib/gollum/markup.rb
	test/test_gitcode.rb

lib/gollum/views/layout.rb

@@ -28,6 +28,10 @@ module Precious
         @css
       end
 
+      def js # custom js
+        @js
+      end
+
     end
   end
 end