fixed screen swapping
Merge branch 'master' of https://github.com/mfasq1Monash/FIT3140