NavigationBar

orange
.

.
Merge branch 'master' of https://github.com/kobreu/rockyourhautApp

Conflicts:
	rockyourhautApp.xcodeproj/project.pbxproj
	rockyourhautApp.xcodeproj/project.xcworkspace/xcuserdata/bettinaebert.xcuserdatad/UserInterfaceState.xcuserstate
	rockyourhautApp/Main.storyboard
	rockyourhautApp/TakePictureViewControllerShort.h
	rockyourhautApp/TakePictureViewControllerShort.m