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

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

Conflicts:
	pegjam2014/ProjectSettings/QualitySettings.asset