new folder and json data and functionality
Merge branch 'master' of https://github.com/respectYourNeighbour/AngularDraft