commit before pulling
Merge branch 'master' of https://github.com/nancywong/ComputerTowerDefense into nancy

Conflicts:
	ComputerTowerDefense/board.h
	ComputerTowerDefense/board.o
	ComputerTowerDefense/gamescreen.o
	ComputerTowerDefense/main
	ComputerTowerDefense/projectile.o
commit before pulling
Merge branch 'master' of https://github.com/nancywong/ComputerTowerDefense into nancy
commit before pulling
Merge branch 'master' of https://github.com/nancywong/ComputerTowerDefense into nancy
commit before pulling
Merge branch 'master' of https://github.com/nancywong/ComputerTowerDefense into nancy

Conflicts:
	ComputerTowerDefense/board.h
Merge pull request #4 from nancywong/nancy

Nancy