initial stab at jasmine tests
uncomment jasmine
fix test
update gitignore
fix broken jasmine tests
fix merge conflicts
Merge pull request #2 from patrickarlt/master

Fix jasmine tests