First commit

my first commit message
second commit
third commit
Merge branch 'development' of https://github.com/mjoostest/Test1 into development

Conflicts:
	file2.txt
Merge pull request #1 from mjoos/development

First pull request