setup
Merge branch 'master' of github.com:kbingman/ragnar-station

Conflicts:
	server.go