translation fixed (vertaling opgelost) <-This text is auto-translated by bing
Merge branch 'master' of https://github.com/nyabb/poc

Conflicts:
	.idea/workspace.xml