added stuff
Merge branch 'master' of https://github.com/vic317yeh/TCHack

Conflicts:
	MeetUp/MeetUp.xcodeproj/project.pbxproj
fixed messy stuff