fixing master
fixing master
Merge branch 'master' of github.com:jamesbeedy/make-dirs

Conflicts:
	config.log