changed README, expecting merge conflict
Merge branch 'master' of https://github.com/tommygebhardt/csci3308