Changed in database.java
Merge branch 'master' into gamestructure
Updated database
Updated database and game structure
Merge branch 'master' into singlethread