This commit contains major and miscellaneous bug fixes
git checkout master
git pull https://gitee.com/theamazingandrew/anneng.git master
git push origin master
