twitter scraper
Merge branch 'master' of github.com:michaelqlarson/twitterexplorer

Conflicts:
	Gemfile
	app/controllers/application_controller.rb