added boat regex
added colors for Biel
Merge branch 'master' into heroku