refactoring
moar refactoring
Merge branch 'master' of https://github.com/gbrodman/finalProject