Mostly done desktop
most finished desktop page, fixed errors
Merge pull request #1 from duncip/gh-pages

master page