fix merge conf in index.html
Merge branch 'master' of https://github.com/oliverswitzer/leftovers-sinatra-angular
map on pickups/new now takes up whole page
Merge branch 'master' of https://github.com/oliverswitzer/leftovers-sinatra-angular