Added gmaps4rails and underscore-rails gem
No change, force commit
add require underscore and require gmaps/google to application.js
added map div to show page (not yet working)
map working
modified map icon
removed inline css for map div and moved to users scss file
Add markers for contacts
fixed merge conficts
fixed error in user.css
added names to flags & new styling
users information are pushed to contacts after sign up and update