Prevent units from coexisting in the same location
Merge branch 'master' of github.com:BuchananBourdon/CSE20212_Project

Conflicts:
	Bunny.cpp
	Unit.cpp
	Unit.h