Revert "Revert "Revert "Revert "Testing travis""""
Merge pull request #7 from LineOfAwesome/revert-6-revert-5-revert-4-revert-3-dev

Revert "Revert "Revert "Revert "Testing travis""""