simultaneous entires on a feature
Merge branch 'develop' of https://github.com/alcdash/test1 into develop
trying to manually clear conflict
Conflicts:
	feature3.txt