add menu states
remove dummy script
Merge branch 'master' of ssh://github.com/leafarz/SALVADOR

Conflicts:
	Assets/Scenes/menu.unity
	Assets/scripts/AutoFade.cs
	Assets/scripts/Loader.cs