Working on feature1 a
Working on feature1 b
Merge branch 'Feature1' into Development
Feature2 commit a
Working on feature 1 c
Merge branch 'Feature2' into Development
Merge branch 'Feature1' into Development

Conflicts:
	test1.txt
Resolved: third line of feature 1 up over first line of feature 2
Created text2 to implement feature 2
This is feature 5 in test3
Updating feature 3
Update to feature 5
Merge branch 'Feature-5' into Development
Merge branch 'Feature-3' into Development
Merge pull request #1 from iasonm/Development

Development