fixed error in Gemfile.lock
Add Twitter gem and config
Add basic Twitter functionality
Remove haml file
Added the Google Map Example
Pulls tweets from a 2 mile radius around College Station
Merge branch 'master' of https://github.com/NicholasHanemann/team9-project3

Conflicts:
	app/views/home/index.html.slim