add .travis.yml
fix conflict on Gemfile
Merge pull request #6 from aycabta/master

Domo, Osusume=san. Travis CI desu.