Merge branch 'master' of https://github.com/daansteegmans/EXP-GAME

Conflicts:
	src/Player.cpp
	src/Player.h
	src/testApp.cpp
Collision