updates from master branch
Merge branch 'gh-pages' of https://github.com/licube/introworkout into gh-pages

Conflicts:
	index.html
update