renamed for jp and hasan
Merge branch 'master' of github.com:cathyatseneca/ipc144-s13