cleaned up code
Merge branch 'master' of https://github.com/andeek/ExtensiveAssignments
derp
Merge branch 'master' of https://github.com/andeek/ExtensiveAssignments