comment edit
Merge branch 'master' of https://github.com/erikstrottmann/ee357-final-project