asdasdas
Merge branch 'master' of https://github.com/sombrelain/hammerzeit2

Conflicts:
	html/index.html
Merge branch 'master' of https://github.com/sombrelain/hammerzeit2

Conflicts:
	html/javascript/entities.js