added A LOT
Merge branch 'master' of https://github.com/Kaybass/CSI-Midterm-Project

Conflicts:
	mushroom.h