Correction erreur de compilation
Merge branch 'master' of https://github.com/ayL47/Casse-brique-INSA-CVL-2014

Conflicts:
	c1/testsdl/obj/Debug/jeu.o
	c1/testsdl/obj/Debug/level.o
	c1/testsdl/obj/Debug/main.o
	c1/testsdl/testsdl.depend