first tisk
almost
json
done js part
Merge pull request #1 from middlefinger/master

testing pull request