Changed folder structure so the github io pages work
Merge branch 'master' into gh-pages

Conflicts:
Fixed em.