added modal window
Merge remote-tracking branch 'origin/master'

Conflicts:
	sass/screen.scss
	stylesheets/screen.css
Merge branch 'master' of https://github.com/annabellenichols/Moodism