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

Conflicts:
	.gitignore
	bower.json
1