Changed folder name
Merge branch 'master' of https://github.com/cbattis/Required-COS-Migration-Files

Conflicts:
	css/company-custom.css
	css/custom.css
	required/custom.css