nieuwe commit
Merge branch 'master' of https://github.com/Melloww/DevelopmentB

Conflicts:
	.idea/workspace.xml
	src/com/development/Main.java