Fixing collision test
Merge branch 'master' of https://github.com/Deph0/DGI14-Project

Conflicts:
	src/rain_scene.cpp