update problem
Merge branch 'Marty' of https://github.com/Katasa/ProjectTraining2-3 into Marty

Conflicts:
	ProjectTraining2&3/Assets/Scripts/Menu.cs