still working on start screen
merging issues part 5
made changes to start and end screen
fixed merging stuff