first checkin for feature 3
Added another line to the text file!
commit from "another" directory copy of project.
Added a line from original project location!
Merge branch 'feature/feature3' of https://github.com/gkostal/TestRepo into feature/feature3

Conflicts:
	feature3.txt
Another - inserted line 2
Original - added a line after line 3
Merge branch 'feature/feature3' of https://github.com/gkostal/TestRepo into feature/feature3
Merge branch 'feature/feature3' into develop
Bumped version to 1.0
Merge branch 'release/1.0'