more changes by barb
Merge branch 'master' of https://github.com/bsibiga/SEG2105Project