Merging bot.c
Merged
Merged
Updated includes in bot.c and added prototypes to marshal.h
Merge branch 'master' into testing

* master:
  Updated includes in bot.c and added prototypes to marshal.h
  Merging bot.c

Conflicts:
	src/bot.c