worked on swirlie
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Assets/Resources/Models/Enemies/Materials.meta
	Assets/Resources/Models/Enemies/Materials/Material.mat
	Assets/Resources/Models/Enemies/Materials/Material.mat.meta
	Assets/Resources/Models/Levels/Materials.meta
	Assets/Resources/Models/Levels/Materials/No Name.mat
	Assets/Resources/Models/Levels/Materials/No Name.mat.meta
put in swirlie
removed debug log
Merge pull request #20 from adao1123/swirlie

Swirlie & Spike