commit before pulling and merging
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
merging
merging
added css/js dropdown box for school on new account form, and cleaned up the controller a little. Cleaned out the order report form for work on the new version.
fixed broken tests
new school form view complete
Cleaning up styling. Added OffDay date blocker to available menu item generating method on menu_item model
corrected broken sign-up and add card wrapper to sign-in
off days integrated and tests fixed
added turbolinks back
Merge pull request #120 from nickpassarella/master

off days functionality added, lots of view cleanup.
various changes to add custom calendar
merged and handled conflicts
precompile
Merge pull request #121 from kheang/master

Added calendar and more styles; precompiled
merged