towers in their own 2d array
Merge branch 'master' of https://github.com/nancywong/ComputerTowerDefense into nancy

Conflicts:
	ComputerTowerDefense/board.h
	ComputerTowerDefense/tower.cpp