Merge remote-tracking branch 'upstream/master'

Index.html as the template for the site
index home page and color changes,etc
Added #map_canvas to locations.html
Rename index to locations.
Swap files.
rename Desktop.css to index.css
fix conflicts
deleted readme.txt
Merge branch 'hsin421-master'

This is our attempt at a first manual merge
Fixed some simple style issues
Fixed file name from location.html to locations.html and updated throughout
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
Fixed the merge conflict in desktop css and location.html