Modified travis yml
Merge branch 'rojotic26-develop'
Fix mistake on gemspec
Merge branch 'rojotic26-develop'
Merge pull request #7 from rojotic26/mjboyarov-develop

Fix mistake on gemspec
Fixed merge conflict
Removed open-uri from gemfile, dinner was good
Fixed gemfile...again
Added UTF-8 coding, Travis was complaining
Played with some stuff
Merge branch 'eddwin-develop'
Merge branch 'master' into rojotic26-develop