Added some basic stuff

Conflicts:

	data.json