implementing feature 2
Merge branch 'feature2' of https://github.com/tzemaitis/testProject

Conflicts:
	file1.txt