style
Merge branch 'master' of https://github.com/MatthewKam/weebook2.0
style
merge conflict fixed