html and js
Merge branch 'master' of https://github.com/amamas/Amira

Conflicts:
	index.html
	js/game_manager.js