Edit Gemfile, Add .travis.yml
Merge branch 'travis'