modify user
Merge branch 'master' of https://github.com/onean/cupup

Conflicts:
	Cupup/Cupup.xcodeproj/project.pbxproj