new work in new branch
this is work in master.
Merge branch 'featur2'

Conflicts:
	README.md
commit featur2
Merge branch 'featur2'

Conflicts:
	README.md
featur2