fix merge confl
fix .DS_Store merge?
Merge branch 'master' of https://github.com/oliverswitzer/leftovers-sinatra-angular
add table to pickups list page