readme changed for red feature
added comment in instructions
nog changes
nog changes 3de
testje
made change after push
master change after green
new file from other pc
Merge branch 'master' into green-feature

Conflicts:
	README.txt
added new comment in README