My test of dependencies within subdirectories.
Merge remote-tracking branch 'mine/master'

Conflicts:
	Makefile