commit
Merge branch 'master' of https://github.com/imangutov/HendricksFinal

Conflicts:
	matlab-code/topics_in_economics_final_project.m