data.json does not belong here anymore
Merge branch 'master' of github.com:QMRV/QMRV

Conflicts:
	data.json