new branch commit
Added the branch feature1
Fixed bugs
new chages
Merge branch 'feature1'

Conflicts:
	README.md
add the new commits
merge the fix2 and master
merge the fix and master