Add file from master branch
Merge branch 'feature1'
Hopefully this will comnflict...
Conflict commit
Merge branch 'master' of github.com:CoreGaming/Workshop9

Conflicts:
	test.md
Another conflict? Hopefully not!
good merge
Merge branch 'master' of github.com:CoreGaming/Workshop9
Merge branch 'master' into feature2