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

Revert "Revert "Revert "Testing travis"""