Edit README from project2
Merge branch 'master' of https://github.com/nuttao/project

Conflicts:
	README