add new stuff from Master
Merge branch 'master' of https://github.com/Ecohen4/Cohen-McCreight
Merge remote-tracking branch 'origin/master'
organization
Merge branch 'master' of https://github.com/Ecohen4/Cohen-McCreight