commit merge conflict
Merge branch 'master' of https://github.com/Lastje/Project_AOROCJL2

Conflicts:
	.classpath
	bin/.gitignore
	bin/Adminpanel$1.class
	bin/Adminpanel.class
	bin/Loginscreen$2.class
	bin/Loginscreen$3.class
	miglayout15-swing.jar