Just a test for myfeature-2
Some message
test commit
Merge branch 'myfeature-2' into development

Conflicts:
	BOT.Library/OnlinerBot.cs