Merge branch 'gh-pages' of https://github.com/asm-products/vacaytake2 into gh-pages

Conflicts:
index.html
Merge pull request #1 from newset/gh-pages

Merge branch 'gh-pages' of https://github.com/asm-products/vacaytake2 in...