Started and completed my part for sprint 3
Made some slight changed to these files
Merge branch 'master' of https://github.com/z-neil/Ecse-428
Merge branch 'modifyitems'
fixed conflicts