added lines between markers
changed stroke color
added if statment to map.js so map is only rendered when div is present
added trips on user show page, added markers on trip show page
Working devise model,views and routes
merged master onto devise