services
Merge branch 'master' of https://github.com/Lochbridge/t1-dpl-hackathon

Conflicts:
	app/js/app.js