Merge pull request #17 from sunny-mittal/sunny

Sunny
Merge pull request #18 from sunny-mittal/sunny

Add stuff
GoogleMaps4Rails working
Merge pull request #19 from sunny-mittal/nManos

*GoogleMaps4Rails working
added form fields to edit profile page.
Merge branch 'gabe'
fix merge conflicts
Fix dependencies