Merge https://github.com/lawrancej/COMP278-2014

Conflicts:
	circuits/cpu-16bit-isa.txt
	circuits/lab6example.circ