service
Merge branch 'gh-pages' of https://github.com/glassy/we into gh-pages

Conflicts:
	js/main-controller.js