ninja1
Merge branch 'master' of https://github.com/dslysenko/flaming-spice

Conflicts:
	Assets/Custom Scenes/map_ninja1.unity
Merge branch 'master' of https://github.com/dslysenko/flaming-spice