presumable step 1
Merge branch 'master' of github.com:bha1993/swe13course
fixed readme conflicts I hope