small changes
Merge branch 'master' of https://github.com/tzheng/A-Web-Project.git