Initial work
Merge branch 'tudelft-ch' of https://github.com/Primigenus/meteor-demo into tudelft-ch

Conflicts:
	.meteor/release
	README.md
	smart.lock
	template.html
Update list of people added to database
Add a bunch of comments to the code
Update comment