add a lot
Merge branch 'inheritance_demo_2' of https://github.com/suberbawer/ciclotimia into inheritance_demo_2

Conflicts:
	app/views/articles/index.html.erb
	app/views/reports/index.html.erb