Merge branch 'master' of https://github.com/03knoppg/ToJam2014

Conflicts:
	Assets/Materials.meta~3e115e4fe5de595c59238f777216bac283deb357
	Assets/Materials.meta~HEAD
	Assets/Prefabs/Environment.meta
	Assets/Scripts/Controls/Contols.cs