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)
added editing contacts funciton
Added edit function for contacts
added some styling and missing links
map working
modified map icon
removed inline css for map div and moved to users scss file
Add markers for contacts
updated version
added search function
added connection to contacts and users
fixed merge conflicts
fixed merge conficts