work commit
Merge branch 'master' of https://github.com/Johangsl/Test

Conflicts:
	Assets/Scenes/Stage1.unity
	Assets/Scripts/EnemyMine.cs