scene upload again
Merge branch 'master' of https://github.com/Bjeck/2Dshooter

Conflicts:
	2dshooting/Assets/scene1.unity