Merge pull request #27 from jonnyparris/travis

adding hisses done
css work
Merge pull request #29 from jonnyparris/css_work

css work
fixed merge conflict