CollisionShape
Merge branch 'master' of gh:opatut/arachnonoia

Conflicts:
	src/Player.cpp
	src/Wall.cpp