text changes
Merge branch 'master' of https://github.com/yxt423/CareerGuidance
move MainActivity into activity folder