Scott Changes
Merge branch 'master' of https://github.com/NGonGames/GlobalGamJam2014

Conflicts:
	Assets/Scenes/Menu.unity
	GlobalGamJam2014.userprefs
Scott's Stuff
Merge branch 'master' of https://github.com/NGonGames/GlobalGamJam2014

Conflicts:
	Assets/Scripts/Shared/NetworkManager.cs
	GlobalGamJam2014.userprefs