Commit?
Merge branch 'master' of https://github.com/FieM/SharpPlatform

Conflicts:
	SharpPlatform/SharpPlatform.userprefs