stuff
Merge branch 'master' of https://github.com/johanss4/KardKit

Conflicts:
	server.js