TODO Complete
Merge branch 'newdotfiles' of https://github.com/shirp/dotfiles into newdotfiles

Conflicts:
	buildingReadConfig.ps1
	dfconfig.json
no message