merge stuff
Merge branch 'master' of https://github.com/magnhalv/TDT4255

Conflicts:
	Oving1/hardware/control_unit.vhd
added control_unit_tb and fixed some bugs