edit profile added
gemfile added
conflict resolve with swami1
Added Google Maps
edit conflicts