...
Merge remote-tracking branch 'origin/master'

Conflicts:
	lab3.gise
replace alu, not tested yet