Merge branch 'master' of https://github.com/generalramen/RVRECANDY into gh-pages

Conflicts:
index.html