Merge branch 'master' of github.com:goodell/highlight

Conflicts:
	highlight