Camera work
Merge branch 'master' of https://github.com/jds0102/GGJ2014

Conflicts:
	ProjectManwich/Assets/Scenes/Level.unity