fixes.
Merge branch 'master' of https://github.com/vaax/gowiki

Conflicts:
	main.go