manually merged some files
Merge branch 'lmene024'

Conflicts:
	CartTracker/CartTracker.xcodeproj/project.pbxproj