Merge branch 'no-color-option'

Conflicts:
	printing/printing.go
Merge branch 'master' of github.com:jonbalbarin/tracker

Conflicts:
	printing/printing.go
Merge branch 'master' of github.com:jonbalbarin/tracker
stories/story instead of total