added new desktop.html and css for layout prototype.  we can rename later.
Merge branch 'master' into zach_branch
erged zach's branch with master
Merge pull request #19 from FlappyMappy/zach_branch

added new desktop.html and css for layout prototype.  we can rename later.