Improved makefile versatility
Improved makefile versatility
Merge remote-tracking branch 'origin/master' into argonaut-kernel

Conflicts:
	src/Makefile