Add stuff
Merge pull request #18 from sunny-mittal/sunny

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

*GoogleMaps4Rails working
added form fields to edit profile page.
Merge branch 'gabe'
fix merge conflicts
added navbar with temp menus.
fix merge conflicts
Merge branch 'gabe'
Fix? merge conflicts
Merge branch 'nManos'