Camera logic
Merge branch 'master' of https://github.com/Epiphane/WhiteRoom

Conflicts:
	pokestyle/src/com/gilded/pokestyle/Player.java