bug fixes
Merge branch 'master' of https://github.com/horsman/pegjam2014

Conflicts:
	pegjam2014/Assets/StartScene.unity
	pegjam2014/Assets/_Scripts/ScrollingCamera.cs
Merge branch 'master' of https://github.com/horsman/pegjam2014