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

Conflicts:
index.html