2nd conflict
Merge branch 'master' of https://github.com/RXiayth/cpsc310lab2

Conflicts:
	README