Test Mysql-Connector fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASG2-ateam/.classpath
Merge branch 'master' of https://github.com/DJxLaurens/ASG2.git