created mock rest service with node and express
merged conflicts