gitignore
test
Merge branch 'master' of https://github.com/Donneh/leintje

Conflicts:
	.gitignore
	.idea/workspace.xml