Project folder change.
Merge branch 'master' of https://github.com/swalt888/Cashier

Conflicts:
	Cashier.xcodeproj/project.pbxproj