no message
Merge branch 'master' of github.com:blueflag/peanut

# By Allan Hortle
# Via Allan Hortle
* 'master' of github.com:blueflag/peanut:
  colored underlines

Conflicts:
	dist/peanut.min.js