Collisions compatible
Merge branch 'master' of https://github.com/AntonyCanut/TMC-DEVC-003

Conflicts:
	SpaceInvader/Makefile