added startsplash
merged conflicts
hejsan
merged stuff
merged