commit with some conclusion edits
Merge branch 'master' of https://github.com/tdmcarthur/econ-718-paper

Conflicts:
	paper-building/#Firstdraft_combined.lyx#
	paper-building/Firstdraft_combined.lyx