.
Merge branch 'master' of https://github.com/ostkaka0/OstBot_2.x

Conflicts:
	src/OstBot.cs