homepage
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
changes to index_jquery and css-marissa
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from MarissaFelitto/master

changes to html_jquery and marissa-css