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

Conflicts:
	data/abra_alba_1file.dat