Hopefully fix txt display in notepad
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitattributes
Merge branch 'master' of https://github.com/mrSkortch/MissionScriptingTools