Created services.
Fixed conflict

Conflicts:
	app/js/services.js