First commit

my first commit message
second commit
third commit
someone else's work
Adding conflict
Merge branch 'development' of https://github.com/mjoostest/Test1 into development

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

First pull request
lalala
feature1
Merge pull request #2 from mjoos/Feature1

feature1
feature2
feature2 (more)
Merge branch 'feature/Feature2' into development
added project; modified .gitignore; modified file1
changed file1
changed file2
changed file3
Merge pull request #4 from mjoos/development

Development
test change 1
Merge pull request #5 from mjoostest/test

Test