Test commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Skylight/Bot.cs
	Skylight/bin/Debug/Skylight.dll