new
Merge branch 'master' of github.com:acus512/stlgamejam_sept2013

Conflicts:
	Assets/Prefabs/Materials/Materials.meta