Starting to add camera logig
Merge branch 'master' of https://github.com/code-curve/Under

Conflicts:
	js/player.js