Add initial websocket code to pickups.js and linked to pickups.js in pickup_form.erb. Add websocket logic on server in middleware folder.
Add ability to send serialized form data to websocket in pickup_form and return to parse JSON in pickups.html
Add code to set default date on new pickups page to today's date
Add commented out combination of code to get back the values of the restaurant
Gemfile merge fix
merge of old pickups js file and keiths websocket js
fix merge conf in gemfile
add set interval to controller for pickups to get data every second
add long polling to pickupslistctrl in order to constantly check for new pickups every second
merge controller.js
Merge branch 'OliversLongPolling' of https://github.com/oliverswitzer/leftovers-sinatra-angular into OliversLongPolling
merge keith's web socket with long polling in controller. Commented out gem pg and puma--will use this db later
merge keith's code with oliver's code