added the README file

also adds author to the README file
creates a new file
Merge branch 'master' of git://github.com/NanYu8/project1
test conflict when running git pull
resolves conflict

Merge branch 'master' of git://github.com/NanYu8/project1

Conflicts:
	first.txt