Merge branch 'userProfile' of https://github.com/ucberkeley/ResearchMatch
Merge branch 'master' of https://github.com/ucberkeley/researchmatch