Pushing gh-pages
Push gh-pages
Merge branch 'gh-pages' of github.com:arcydouglass/massage into gh-pages

Conflicts:
	prototype.html
Push to gh-pages