commit
commit
commit
commit
Merge https://github.com/e9-dbeech/RepsUk

Conflicts:
	RepsUK.Web/Content/images/company-logo.png
	RepsUK.Web/Controllers/ImageController.cs
	RepsUK.Web/RepsUK.Web.csproj
	RepsUK.Web/WebApp/clients/clients-edit.html
	RepsUK.Web/WebApp/clients/clients-table.html
	RepsUK.Web/WebApp/clients/clientsModule.js
	RepsUK.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RepsUK.v12.suo
commit
Merge https://github.com/tarpitgrover/RepsUk

Conflicts:
	RepsUK.v12.suo
commit
commit
Merge https://github.com/tarpitgrover/RepsUk

Conflicts:
	RepsUK.Web/RepsUK.Web.csproj
	RepsUK.Web/WebApp/clients/clients-edit.html
	RepsUK.Web/WebApp/greeters/greeters-edit.html
	RepsUK.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RepsUK.v12.suo
commit