generating report data and show in very basic form
Merge branch 'master' into report_data

Conflicts:
	app/views/pages/welcome.html.erb
	app/views/reports/show.html.erb