Updated Gitignore to fix my PyCharm mess
Merge remote-tracking branch 'origin/master'

Conflicts:
	TextModeControl/.idea/workspace.xml