;
Merge branch 'master' of https://github.com/alecwilcox/1hourrush

Conflicts:
	.DS_Store
	1 Hour Rush/1 Hour Rush.xcodeproj/project.pbxproj
	1 Hour Rush/1 Hour
Rush.xcodeproj/project.xcworkspace/xcuserdata/KyleFord.xcuserdatad/UserI
nterfaceState.xcuserstate
	1 Hour Rush/1 Hour Rush/__Hour_Rush.xcdatamodeld/.xccurrentversion