branch test
&
new
veryveryvery
Merge branch 'feathure1'

Conflicts:
	README.md
fix bug 101
merged bug fix 101