Classwork from 11/12/14
Merge branch 'master' of github.com:wifelette/codefellows