Modify front end
Merge https://github.com/FeiyuYin/272_Project
Merge for push