adding shooting
Merge branch 'master' of https://github.com/mukk88/cs470

Conflicts:
	bot.h
this was fun
git