i hate git
i hate git x 2
What is happening

Merge branch 'master' of https://github.com/erichare/extensive-assignments

Conflicts:
	ext1/figure/sales_plot.pdf