fixed div name
Merge branch 'master' of github.com:ryanmt/wedding_website

Conflicts:
	app/assets/stylesheets/pages.css.scss
Merge branch 'master' of github.com:ryanmt/wedding_website