working on getting db hooked up
Merge branch 'master' of https://github.com/VikiAnn/backcountry-deli-clone-wars

Conflicts:
	app.rb
	lib/location.rb
	lib/location_store.rb
Merge branch 'master' of https://github.com/VikiAnn/backcountry-deli-clone-wars
Merge branch 'master' of https://github.com/VikiAnn/backcountry-deli-clone-wars
Merge branch 'master' of https://github.com/VikiAnn/backcountry-deli-clone-wars
Merge branch 'master' of https://github.com/VikiAnn/backcountry-deli-clone-wars
Merge branch 'master' of https://github.com/VikiAnn/backcountry-deli-clone-wars
css styling finished for banner and sort of finished for footer