code won't work yet but pushing to heroku anyway
remove db and start fixing code
fixed naming and file creation
Merge branch 'master' of github.com:michaelqlarson/twitterexplorer

Conflicts:
	app/controllers/application_controller.rb