I keep forgetting to commit. Connecting to server. Adding splash screen.
fixed merge conflicts
splash screen working
commit before merge