Merge branch 'master' of github.com:pipex/gollum into codemirror-integration
Merge branch 'mygollum' of github.com:pipex/gollum into codemirror-integration
Merge branch 'codemirror-integration' into mygollum