got some multi thread action, the database connection still needs to be moved
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/collector/src/tileMapStuff/Game.java
got some multi thread action, the database connection still needs to be moved