intermediate commit for bombs
bombs boooom
booommbs
booom booom
Merge branch 'master' of https://github.com/danielsuter/tank-wars

Conflicts:
	src/main/webapp/index.html