Created json response in controllers

YAAAAAAAAAAAAAAAAAAAAS
Fixing a merge conflict (Jake's fault)