br working now
Merge branch 'master' of https://github.com/cglong/CS-3220-HW3

Conflicts:
	Simulator/simulator.cc