stealing travisiz commit bwahahahah
Merge branch 'dev'
adding travisiz js