debug a lot...
Merge branch 'master' of https://github.com/lidise7en/842lab0

Conflicts:
	src/Makefile