Set up infrastructure for Jasmine testing
Saving work
Merge branch 'master' into jasmine