modernised my trigram solution
fixed bug with dash in trigrams
Merge branch 'master' of https://github.com/codefellows/sea-f2-python-sept14