Merge branch 'master' of https://github.com/Oreganik/GGJ-Eugene-2014

Conflicts:
	Assets/Sampo/lvl-01.unity.meta
	Assets/Zach/lvl2-1.unity.meta
	Assets/Zach/lvl2-1.unity.meta~Camera follow
	Assets/orion.meta
	Assets/orion/Door.cs.meta
Merge branch 'master' of https://github.com/Oreganik/GGJ-Eugene-2014

Conflicts:
	Assets/Sampo/lvl-01.unity.meta
	Assets/Zach/lvl2-1.unity.meta
	Assets/Zach/lvl2-1.unity.meta~HEAD
	Assets/orion.meta
	Assets/orion/Door.cs.meta
Merge branch 'master' of https://github.com/Oreganik/GGJ-Eugene-2014