final html/css updated- not including side buttons

Judy
Merge branch 'version2' of https://github.com/annabellenichols/Moodism into version2

Conflicts:
	sass/screen.scss
	stylesheets/screen.css
html final page with css

Judy