Updated README from computer
Merge branch 'master' of https://github.com/kyangca/cs3-homework1

Conflicts:
	README