added feature1
new edit feature1 added
feature2 commited
Merge branch 'feature1' into feature2additional

Conflicts:
	Readme.txt
Added feature 3