travis integration
Merge pull request #2 from zeldal/master

travis integration