Fixed stuff
Merge branch 'master' of github.com:ellingjp/ee472

Conflicts:
	lab4/code/measure.c