Merge pull request #289 from cchan5/master

Added a GeoLocation model and controller
updateing
Able to load from server.  Enjoy the bins and srcs losers
DID I BREAK IT?!
Merge branch 'elasticSearch' into elasticSearchDev
Able to load from server. Enjoy the bins and srcs losers
Geolocation works hardcoded
Fixed Ruby and Eric
's merge conflict
Merge pull request #293 from cchan5/master

Geolocation works hardcoded.
Working on adding posts to server
Merging changes

Merge branch 'elasticSearchDev' of https://github.com/CMPUT301F14T03/lotsofcodingkitty into elasticSearchDev
Yo
Trying to implement push
Added more functionality for geolocation
Added more geo location functions
Merge pull request #296 from pachalad/elasticSearchDev

Elastic search dev
combining picture stuff with elastic search stuff

Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev-josh