functional navigation between views, greyed out sign-up
Merge branch 'SignUp'

Conflicts:
	Zobelisk/Zobelisk.xcodeproj/project.xcworkspace/xcuserdata/Green.xcuserdatad/UserInterfaceState.xcuserstate
	Zobelisk/Zobelisk/Base.lproj/Main.storyboard
	Zobelisk/Zobelisk/MIZMapViewController.h
	Zobelisk/Zobelisk/MIZMapViewController.m
Merge branch 'master' of github.com:chrisdopuch/Zobelisk

Conflicts:
	Zobelisk/Zobelisk/Base.lproj/Main.storyboard