a
Merge branch 'master' of https://github.com/Jonty800/HelperBot
htbngd
Merge branch 'master' of https://github.com/Jonty800/HelperBot

Conflicts:
	HelperBot/Events.cs
	HelperBot/Triggers.cs