Merging bot.c
Merged
Merged
Updated includes in bot.c and added prototypes to marshal.h