grading
Merge branch 'master' of https://github.com/mksemcken/iOS-projects

Conflicts:

RestaurantApp/RestaurantApp.xcodeproj/project.xcworkspace/xcuserdata/ail
een.xcuserdatad/UserInterfaceState.xcuserstate