rename Desktop.css to index.css
before merge
Merge remote-tracking branch 'upstream/master'

a merge
Add blank about page, minor fixes to links
Merge pull request #4 from hsin421/master

Adding a blank about page, and minor fixes