services.js
Merge branch 'master' of https://github.com/dundich/sked

Conflicts:
	public/app/index.html