Added some basic stuff

Conflicts:

	data.json
Merge pull request #13 from arnebech/basic1

Added some basic stuff