makefile update
Merge branch 'master' of https://github.com/josiahmwalton/EXO
I hope this works!

Conflicts:
	EXO_Energy_Gains/Makefile