updates on the me page.
Merge branch 'master' of https://github.com/hengjiaqi/sanbox

Conflicts:
	Storyboard.storyboard
	sandbox.xcodeproj/project.pbxproj
	sandbox/T3mepage.m
merge