zelig etc
Merge branch 'master' of https://github.com/NicolasatHertie/FinalProject

Conflicts:
	fig2.png
	table1.txt
yeahhhh
Merge branch 'master' of https://github.com/NicolasatHertie/FinalProject