Worked on information window in game.html and started with edit_game.html
fixed conflicts
Merge pull request #16 from Gegga87/master

eeermp