camera is following again (SOMEBODY's WATCHING YOU!)
Merge branch 'master' of https://github.com/depstein/ggj-2014

Conflicts:
	code/Assets/Scripts/Player.cs