controller and json.md structure
merge
Merge branch 'aethawalka-master'