commit
Merge branch 'master' of https://github.com/bwong17/Looped

Conflicts:
	Looped.xcodeproj/project.pbxproj