refactored
Merge branch 'master' of https://github.com/justindeguzman/pennapps-2014-fall