Merge pull request #61 from kendallflutey/JS_Test

Js test
Merge branch 'master' into JS_Test
5 jasmine tests testing category_drop_pin.js