fixed server error
Merge branch 'master' of github.com:jaswu777/MyLife