committing local
Merge branch 'master' of https://github.com/AaronGreenberg/ELEFAN
committing stuff