Merge branch 'master' of gramma-git:burninggramma/burning-game into develop
Merge branch 'master' of gramma-git:burninggramma/burning-game into develop
Updates TODO.md
Merge branch 'master' of gramma-git:burninggramma/burning-game into develop

Conflicts:
	doc/TODO.md
Merge branch 'develop' of gramma-git:burninggramma/burning-game into feature/collision

Conflicts:
	doc/TODO.md