ready for main page
Merge branch 'master' of https://github.com/stuycs-ml7-projects/StuyWeb