Josh vs Josh
An segfault
Merge branch 'sample_bot' of github.com:NosotrosNueces/mcc into sample_bot

Conflicts:
	src/sample_bot.c