Get current location
Tweets Controller
Add marker to map
Merge branch 'master' of https://github.com/phatograph/tweather

Conflicts:
	app/controllers/home_controller.rb