Geo kind of implemented
Merge branch 'master' of https://github.com/rcchen/cs210-stockholm

Conflicts:
	app/controllers/api_controller.rb