Added basic Ability class from cancancan. Still need to add to controllers when routes are finished
Merge branch 'master' into upstream_merge
merging
block admin link from navbar unless admin
added schools controller
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
merging
removed params from orders#new link; added default_scope to ordered items model to order by created_at date
Merge pull request #93 from kheang/master

removed params from orders#new link; added default_scope to ordered item...
changed quantity to number field
Merge https://github.com/lunchpad/lunchpad
merging
Allow orders to be copied forward X number of weeks
updated tests for order copy
Merge pull request #94 from kheang/master

Allow orders to be copied forward X number of weeks
added schools controller, and first draft of order report view
merging
basic order reports complete, re-added :id hidden field to order form because test was breaking, but that should probably be refactored
Merge pull request #95 from nickpassarella/master

Basic school admin roles, admin page, school order reports complete. Needs refactoring.
merge conflict resolved