Yay for karma tests
Merge pull request #6 from simon-kim/homework2

Yay for karma tests