EFFING FIXED IT!
Merge branch 'master' of https://github.com/phurbu/Market_phurbu

Conflicts:
	Market.xcodeproj/project.pbxproj