No idea what these changes are or when they took place. I will just accept your changes
Merge branch 'master' of https://github.com/christophergandrud/GreenBook

Conflicts:
	Paper/main_GreenBook-concordance.tex
	Paper/main_GreenBook.tex
OMG