Fixed a conflict between the tell and nickscore modules
Merge branch 'master' of github.com:gentoomen/bhottu