cosmetics and a bug fix
Merge branch 'master' of https://github.com/jessyarbrough/mech-jung

Conflicts:
	templates/index.html