Commit to gh-pages
Fixed header file name
Fixed header2.jpg
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
Merge branch 'master' into gh-pages
Changes about photo resolution