Gemfile merge fix
merge of old pickups js file and keiths websocket js
fix merge conf in gemfile
Merge branch 'LongPoll' of https://github.com/oliverswitzer/leftovers-sinatra-angular into LongPoll
add postgres to gemfile, and move db configure blocks to its own file
add timeout that waits 1 milisec to for content to load before changing section margins on pickups page