add dumb.rdb to gitginore
fix merge conf in gitignore
Add rackup instructions
Merge branch 'master' of github.com:oliverswitzer/leftovers-sinatra-angular
Add more websocket checks and code
Add more websocket checks and code
update a lot of css styling on new pickup page, pickups index page, and pickups show page
ignore dumb.rdb
git ignore data/keys.yml