Fix #8
Merge branch 'master' of github.com:githubnemo/wikirace-serv

Conflicts:
	wiki.go