fix conflicts
fix master bug
Merge branch 'master' of github.com:omahacodeschool/twitter-diversity-report
add show view
routes update
udpate application flash and notice
allow for path to reports from user and non-user
take out create action in user model
take out session
Merge branch 'master' into report_views

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
clean up welcome page a bit
Merge branch 'master' into report_data

Conflicts:
	app/controllers/reports_controller.rb
generating report data and show in very basic form