added pages for report inputs, and fixed report attributes
Merge branch 'working-on-reports'

Conflicts:
	app/views/layouts/_header.html.erb

trying to fix merge