more stuff
Merge branch 'master' of https://github.com/puttputt/safestation

Conflicts:
	client/main.html
Merge branch 'master' of https://github.com/puttputt/safestation