Ä!
Merge branch 'master' of github.com:barnholdy/bln_game

Conflicts:
	index.html