derp
Merge branch 'master' of https://github.com/jdmcclain47/ExtendedHubbard2

Conflicts:
	src/a.out
	src/ao_ints.h
yep