Updated README for conflict
Updated README to fix conflict
Merge branch 'master' of https://github.com/jcs4te/lab5