add file
Merge branch 'master' of github.com:onean/cupup

Conflicts:
	Cupup/Cupup.xcodeproj/project.pbxproj
	Cupup/Cupup/CommodityfViewController.h