Merge pull request #1 from rrix/master

Add gollum wiki