Fixed player bouncing issue
Merge branch 'master' of github.com:TerranceN/GGJ2014

Conflicts:
	src/ata/GameLogic.as
Fixed player bouncing when camera is at the screen edge