testing with branches
test branching 2
Merge branch 'testbranch'

Conflicts:
	test.txt
Added new content to readme
Fixed bug in readme
new feature update
Merge branch 'feature1'

Conflicts:
	README.md