added gemfile
Merge branch 'travis-ci' into development
Merge branch 'development'