Check room boundaries when checking collisions
Merge branch 'master' of github.com:matessim/GGJ2014

Conflicts:
	src/common/player.py