fra alex
Merge branch 'master' of https://github.com/ter9ng/MuseumTour_GitHub

Conflicts:
	Assets/Menu.cs
	Assets/Phase2GUI.cs
	Assets/scan_pic.unity
	Assets/scene2.cs