db hejs
Merge branch 'master' of https://github.com/Catpaw42/Matador.git

Conflicts:
	Matador_2/src/game/GameController.java
Merge branch 'master' of https://github.com/Catpaw42/Matador.git

Conflicts:
	Matador_2/src/db_communication/PlayerDAOImpl.java
	Matador_2/src/db_communication/PlayerDTO.java
	Matador_2/src/db_connecter/DBTest.java