Hero assets
Merge branch 'master' of https://github.com/PRosset/LudumDare

Conflicts:
	LudumDare/Assets/FBX/Testing/Materials/lambert1.mat
	LudumDare/Assets/FBX/Testing/Materials/lambert1.mat.meta