Merge branch 'gh-pages' of https://github.com/wmora/angular-espresso into gh-pages

Conflicts:
	index.html