makefile improved
Merge branch 'master' of https://github.com/clenart/221_A1

Conflicts:
	tests/makefile