updated readme
Merge branch 'master' of https://github.com/iliu88/cs3-homework1

Conflicts:
	README