refactored
Merge branch 'master' of https://github.com/ColoradoSchoolOfMines/smartlots
refactored