merge
this is a mess
Merge branch 'master' of https://github.com/Tailor-MadeSystems/web

Conflicts:
	services.html