Updated
Merge branch 'master' of https://github.com/fcorange/econ103_final_project

Conflicts:
	code.R