Merge pull request #1 from ranhaveshush/master

Fixed json tamplate data.json
for mushon tomorrow
Merge pull request #2 from ronishemi/master

for mushon tomorrow