skeleton done
Merge commit 'dcc03a2ab8996972aa9fd0a32c32d9ef23607feb' into Chriss_branch

Conflicts:
	iOS_Project/Base.lproj/Main.storyboard
	iOS_Project/ViewController.m
Merge branch 'Chriss_branch' of https://github.com/KurtRobo/iOS_Project

Conflicts:
	iOS_Project.xcodeproj/project.pbxproj
	iOS_Project.xcodeproj/project.xcworkspace/xcshareddata/iOS_Project.xccheckout
	iOS_Project/AppDelegate.m
	iOS_Project/Base.lproj/Main.storyboard
	iOS_Project/Info.plist
	iOS_Project/Model.xcdatamodeld/Model.xcdatamodel/contents
	iOS_Project/ViewController.h
	iOS_Project/ViewController.m