delays and modals
Merge branch 'master' of https://github.com/seejayne/PizzaTime

Conflicts:
	PizzaTime/PizzaTime.xcodeproj/project.pbxproj
	PizzaTime/PizzaTime/Base.lproj/Main.storyboard
Merge branch 'master' of https://github.com/seejayne/PizzaTime