Task 4 with service
Merge branch 'master' of github.com:agilejs/fancyTeam

Conflicts:
	client/index.html
	client/js/controller.js