Controller Views Updated

Updated controller views with the navigation controller.
Ready for Images to be uploaded.
Merge branch 'jmwhicke/controllers'

Conflicts:
	Wheres_Miley.xcodeproj/project.pbxproj

Wheres_Miley.xcodeproj/project.xcworkspace/xcshareddata/Wheres_Miley.xcc
heckout