add data
add data file json
remove merge markers
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/main.js
	index.html