stopp conflicting!!!
Revert "Highlighting"

This reverts commit 306a9f92ca846a25cc017b178c20a7e713be3b34.

Conflicts:
	Main.cpp