added json
Merge branch 'master' of github.com:franklingu/Visual-IDE

Conflicts:
	client/app/1.html