before merge
Merge branch 'master' of https://github.com/mathieumailfert/jambot

Conflicts:
	Jambot/Source/MyCore.h