flight to angular
Merge branch 'master' of https://github.com/dundich/sked

Conflicts:
	public/index.html