Edited README on computer
Merge branch 'master' of https://github.com/ligu92/cs3-homework1

Conflicts:
	README