Conflicts:
	bin/gollum
	lib/gollum-lib/markup.rb
	lib/gollum/frontend/app.rb
	lib/gollum/frontend/templates/file_view.mustache
	lib/gollum/frontend/templates/layout.mustache
	lib/gollum/frontend/views/layout.rb
	test/test_app.rb

Fix for embedding code from github

Conflicts:
	lib/gollum/frontend/public/gollum/css/gollum.css

Add option for custom js (like custom css)

[[_]] float clearing tag experiment

Conflicts:
	README.md
	gollum.gemspec
	lib/gollum/frontend/public/gollum/livepreview/licenses/licenses.txt
	lib/gollum/frontend/public/gollum/livepreview/readme.md
	test/test_app.rb

* Add a new 'js' flag to indicate you want to embed a file named 'custom.js'
  which should exist at the root of the wiki

Fix symlink base path, don't allow in bare repos

Basic support for symbolic links

Update references to new project location

Fix tests that depended on old github location

* Change 'github/gollum' references to 'gollum/gollum'

* Two tests depended on the following file existing:
  github/gollum/master/test/file_view/1_file.txt

Fix #645

Fix empty commits and non-descript revert messages (For #612)

  * Empty commits via editor now have the message: "[no message]"
  * Reverts now have the slightly more useful message: "Revert commit #1234567"

Update the GFM link in the README