Posted solutions
Merge branch 'master' of github.com:portlandcodeschool/jse-fall14-4
Removed Joel's files from master
Merge branch 'master' of github.com:portlandcodeschool/jse-fall14-4 into gregorynoack