v1.0
Merge branch 'master' of github.com:benzhou/Hello-Git

Conflicts:
	README