trying to get travis to work
Merge pull request #1 from ieatkimchi/travis

trying to get travis to work