hi reports
hi reports
Merge branch 'master' of https://github.com/randovalimets/CashMatador

Conflicts:
	db/development.sqlite3