testing jasmine
Merge pull request #3 from ThirdPlanetOut/jasmine

testing jasmine