Testing travis
testing travis again
Merge pull request #3 from ted123/dev

Testing travis