First page commit
Merge remote-tracking branch 'origin/gh-pages'

After some testing with github pages