Merge branch 'gh-pages'
index got messed up somehow, fixed it
moving site over to temp then merge back into gh-pages
Merge branch 'temp' into gh-pages