fortunes takes 'q' to quit
Color jot output when showing past entries
Minor copy edit on Salary.rb
Syncing up in preparation for leaving this job
Merge branch 'master' of https://github.com/borkabrak/binfiles

Conflicts:
	jot