good morning
Merge branch 'master' of https://github.com/lwang84/MHackberrithon1

Conflicts:
	MHackberrithon/MHackberrithon.xcodeproj/project.xcworkspace/xcuserdata/haidongtang.xcuserdatad/UserInterfaceState.xcuserstate