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

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

*GoogleMaps4Rails working
Merge branch 'gabe'
fix merge conflicts
Users displaying on map
fix merge conflicts
Merge branch 'gabe'
Fix? merge conflicts
Merge branch 'nManos'
trying to fix git problems
Merge pull request #23 from sunny-mittal/nManos

trying to fix git problems
Fix dependencies
blerb
Merge pull request #24 from sunny-mittal/sunny

Sunny