Merge branch 'master' of https://jeffhartley3925.visualstudio.com/defaultcollection/_git/Composer
Merge
Merge https://jeffhartley3925.visualstudio.com/defaultcollection/_git/Composer

Conflicts:
	.gitignore