Add Configuration for Travis and badge to README
Resolve merge conflicts
Make travis.yml a hidden file
Merge pull request #5 from AlexPatriquin/travis

Add Configuration for Travis and badge to README