Made some changes during lab
Fixed merge conflict
Edited Readme
Merge branch 'master' of https://github.com/jimjh/315-project