removed console-logs
fixed end screen related stuff
Merge remote-tracking branch 'origin/master'
fixed end screen related stuff
fixed end screen related stuff
fixed end screen related stuff