Updated data.js
Conflicts:
	data.js