Startscreen changes
Collision
Merge remote-tracking branch 'origin/master'
ur ook?
Fixed Conflicts after merge.