develop
travis
travis
Merge pull request #11 from zioplox11/develop

adding jasmine and other things to travis