cleanup and add corquad stuff
Merge branch 'master' of https://github.com/jordan-stone/ARIES
not sure what's going on... trying to push a bunch of deletions...