added jasmine testing
fixed merging