more on report

more on report
Merge branch 'master' of https://github.com/bahit/FacultyCooperative

Conflicts:
	app/views/hello.php