added splash screen
fixing merge conflicts