lives
Merge branch 'master' of https://github.com/jsteemann/foxx-tank

Conflicts:
	assets/templates/inGame.ejs