.
.
Merge branch 'master' of github.com:tassadarforaiur/cs350

Conflicts:
	lab10/a.out
	lab10/program.hex