Start merging files
Merge branch 'master' of https://github.com/iCAPLyon1/GameOfTron
Fix lot of bugs

Conflicts:
	index.html