basic jasmine test setup
add jasmine tests
resolve merge conflict