Trying with JSON receiving
Merge branch 'master' of github.com:eurushibata/hackathon

Conflicts:
	backend/index.html