solves merging conflict
removes test task from default gulp task
tests response object from pricing.price
creates watch for gulp task 'test'