Merge pull request #1 from a1mueller/Amy

Look at this group work
added daves file
lori
Merge pull request #3 from a1mueller/dave

set to merge
Merge pull request #2 from a1mueller/Lori

lori
homepage
renamed to index.html to ensure default on webpage
Merge branch 'master' into Amy
First draft of css with rough outline and crazy colors. Included options for backgrounds but they are most likely too light in color