end of class week 6
Merge branch 'master' of https://github.com/arpreading/ISD2014