Updated version (minor changes) by Cindy\
Merge branch 'master' of https://github.com/fcorange/econ103_final_project