someone else's work
Adding conflict
Merge branch 'development' of https://github.com/mjoostest/Test1 into development

Conflicts:
	file2.txt