Adding Endpoint Class
Merge branch 'master' of github.com:scott-thomson/carers

Conflicts:
	.cache