replaced coffee files with js
Added Delivery model, controller, routes, views
began work on delivery manifest
Checkboxes on the delivery manifest page now function & update the delivered attribute of each record in the database
Corrected data type of user_id and subscription_id in Deliveries table to integer
Added scope to sort deliveries manifest by user postal code
Migration after master pull
Merge with delivery
added welcome, denied, logout static pages and routes
resolving schema conflicts
Removed Upcoming deliveries view since it was just a duplicate of the manifest
Deleted coffee file for dashboard
Added functionality to pull previous weeks' manifests
Merge branch 'master' of https://github.com/mohamedfarazi/project_beer
Migration after pulling latest master
Merge branch 'master' of https://github.com/mohamedfarazi/project_beer

Conflicts:
	app/views/admin/subscriptions/upcoming.html.erb
	app/views/layouts/application.html.erb
	app/views/pages/denied.html.erb
migration after pulling master
Changed new subscriptions page to visible when not logged in
Deleted unused json view
Migrated my DB - changed a background in component.css