continue work on core.cs
Merge branch 'master' of https://github.com/lownlazy/punchbot

Conflicts:
	PunchBot/PunchBot.csproj