Merge pull request #1 from mpandar/master

更新个人中心
hotwords
Merge branch 'master' of https://github.com/joy32812/beauty
Removed file that shouldn't be tracked
add gitignore
hotwords almost done
login page
login page
个人中心storyboard
合并代码