Merge branch 'master' into associations
travis.yml
Merge pull request #12 from arieldiamond/travis

Travis