finished exercise 2 and added jasmine testing