adding hisses done
fixed merge conflict
Merge pull request #27 from jonnyparris/travis

adding hisses done