Collision qui bug..
Merge branch 'master' of https://github.com/EmileCadorel/Teelol

Conflicts:
	trunk/gr/CMakeLists.txt
	trunk/gr/main.cc