Jons gh pages

I accidentally merged this into the wrong branch, merging it again..