Updating for Text Displays
Merge branch 'master' of https://github.com/moschwar/CMPS20

Conflicts:
	IncognitOwl/screenMan.js