I don't know what I'm doing! :S
Merge branch 'master' of https://github.com/nihilocrat/ggj2014_omen

Conflicts:
	Assets/3D Models.meta
	Assets/3D Models/Level1.FBX.meta
	Assets/3D Models/Materials.meta
	Assets/3D Models/Materials/01 - Default.mat.meta
	Assets/3D Models/Materials/02 - Default.mat.meta
	Assets/3D Models/Materials/03 - Default.mat.meta
	Assets/Scenes/level1.unity.meta