Small changes made to tkinter_text.py
Fixing merge fail

Merge branch 'master' of https://github.com/lsilverwolf/SoftDesProject

Conflicts:
	tkinter_text.py