Change to js
Merge pull request #21 from krauzer/tickets

Change to js
Merge branch 'master' of github.com:krauzer/fist_of_five_group_project into molly

pull changes from master