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

Conflicts:
	pegjam2014/Assets/Bootstrap.unity
	pegjam2014/Assets/Bootstrap.unity.meta
	pegjam2014/Assets/Scenes/Allan.unity
	pegjam2014/Assets/Scenes/Allan.unity.meta
	pegjam2014/Assets/Scenes/Biomes.unity
	pegjam2014/Assets/Scenes/Biomes.unity.meta
	pegjam2014/Assets/Scenes/Bootstrap.unity
	pegjam2014/Assets/Scenes/Bootstrap.unity.meta
	pegjam2014/Assets/Scenes/SavedScene.unity
	pegjam2014/Assets/Scenes/SavedScene.unity.meta
	pegjam2014/Assets/Scenes/StartScene.unity
	pegjam2014/Assets/Scenes/StartScene.unity.meta
	pegjam2014/Assets/StartScene.unity
	pegjam2014/Assets/StartScene.unity.meta
	pegjam2014/Assets/_Scenes/Bootstrap.unity
	pegjam2014/Assets/_Scenes/Bootstrap.unity.meta
	pegjam2014/Assets/_Scenes/StartScene.unity
	pegjam2014/Assets/_Scenes/StartScene.unity.meta
	pegjam2014/ProjectSettings/EditorBuildSettings.asset