added colors
Merge remote-tracking branch 'origin/master'

Conflicts:
	authlog-parser.rb