Use less vague language.
Remove weird 'xo' string in edit_mult view.
Squash nav bar into one div.
Ignore sass crap generated by emacs' scss-mode.
fix page and site titles to reflect co-op if one is set. show next meal box
Merge pull request #35 from daf-/improve-language

Improve language
Merge branch 'master' of https://github.com/daf-/coop-site into jack-calendar-changes
Mediocre css dropdown menu.
Slick new nav-bar with drop-down menus.

Trivial web-tutorial styling.
Merge pull request #36 from daf-/jack-calendar-changes

add next meal and fix titles
Merge branch 'master' of https://github.com/daf-/coop-site into new-nav-bar

Conflicts:
	app/assets/stylesheets/layout.css.scss
Merge pull request #37 from daf-/new-nav-bar

New nav bar
fix no meal and improve colors in calendar. change sizing of next meal. highlight next meal in green on calendar
emphasize weekends. add triangles to drop downs. reduce empty space in between site header and page content.
hide most next meal info for non-members. also don't show 'click for more info' to non-members
show meal info in popup on click. exits on click anywhere
only open pop-up for meals with info to show
Merge pull request #38 from daf-/calendar

Calendar updates
Don't show calendar if no meals have been added.
Merge branch 'master' of https://github.com/daf-/coop-site into calendar