complete display Engine
Merge branch 'mergeBranch' of https://github.com/Winkies/Type-R into mergeBranch