testing login-function in Main.java
Merge remote-tracking branch 'origin/master' into login
Updated gitignore to not track thumbs.db
Updated gamefiles
Merge branch 'master' into gamestructure
Some small changes - still a bug at StartScreen tho
Added Dropbox upload and Download function
Merge branch 'master' into Adam
Updated database connection
Merge branch 'master' into gamestructure
Changed in database.java
fixing conflicting main-file
update StartScreen
Updates
Merge branch 'master' into design
update merging shit
Merge branch 'master' into gamestructure
Updated again - felix is a nooob
Merge fix by Felix(C)
Updated database