Merge pull request #10 from Travis-S/develop

Figuring out Travis-CI
Merge pull request #11 from Travis-S/master

Merge pull request #10 from Travis-S/develop