next pick up view
Merge branch 'master' of https://github.com/DouglasSherk/Swapp

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/views/templates/pickups.html.erb