added start and end screens
Merge branch 'master' into newphilicia
debugged