nog meer change
Merge branch 'master' of https://github.com/snapcat/backend

Conflicts:
	README.md