.
Merge remote-tracking branch 'origin/master'

Conflicts:
	chip/subsystems/BlackBox/GWTF/VHDL/blackbox-behaviour.vhd
	chip/subsystems/BlackBox/GWTF/VHDL/blackbox_tb-behaviour.vhd
	chip/subsystems/BlackBox/GWTF/VHDL/stream-behaviour.vhd
	chip/subsystems/BlackBox/GWTF/VHDL/stream.vhd
	chip/subsystems/BlackBox/GWTF/VHDL/stream_tb-behaviour.vhd
	chip/subsystems/SDCARD/klokdeler.vhd
	verslagen/Mid-term/Mid-term.aux
	verslagen/Mid-term/Mid-term.log
	verslagen/Mid-term/Mid-term.out
	verslagen/Mid-term/Mid-term.pdf
	verslagen/Mid-term/Mid-term.synctex.gz
	verslagen/Mid-term/Mid-term.tex