Travis integration
Merge pull request #10 from SleepingPills/travis-integration

Travis integration