add master
Merge branch 'master' of https://github.com/binchen/project1

Conflicts:
	README.md