testing login-function in Main.java
Merge remote-tracking branch 'origin/master' into login
Some small changes - still a bug at StartScreen tho
fixing conflicting main-file
update merging shit
Updated again - felix is a nooob
Merge fix by Felix(C)