scales
Merging home version with school version. School version has
Merge branch 'master' of https://github.com/AaronGreenberg/ELEFAN