Removed duplicate file I created
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/BotKit 2015.cpp