hour report
Merge branch 'master' of https://github.com/n0body/squid-log

Conflicts:
	parser.rb