merge
Merge branch 'master' of https://github.com/nolimet/GameJam2014

Conflicts:
	Assets/Textures/Materials/EnemyMat 3.mat