Merge remote-tracking branch 'upstream/master'

Index.html as the template for the site
index home page and color changes,etc
fix conflicts
deleted readme.txt
Merge branch 'hsin421-master'

This is our attempt at a first manual merge