Finally fixed movements
Merge branch 'master' of https://github.com/BeaconTeam/Beacon

Conflicts:
	src/Player.h