preScreen now transfers control to mainScreen
Merge remote-tracking branch 'origin/master'