Merge branch 'master', remote-tracking branch 'origin'
canteenmanagent added
request for inventory added
Merge branch 'master', remote-tracking branch 'origin'
reports
reports
Merge remote-tracking branch 'origin/library'
Merge remote-tracking branch 'origin/holiday_calendar'
Merge remote-tracking branch 'origin/inventory'
conflict correction at seeds.rb
Principal view of term results