edit files in different encoding format
change encoding back to UTF-8
edit bb.sj
remove test complete project
add test complete project back
add encoding file
change encoding for encoding file
remove dd.sj, readd it
remove bb.sj
ignore tcCfgExtender
add bb.sj in UTF-8
update .gitattributes
aa
Merge branch 'master' into topic-notepad

Conflicts:
	TestComplete9/TestCompleteLearning/NotePad/Script/Script.tcScript
	TestComplete9/TestCompleteLearning/NotePad/Script/aa.sj
	TestComplete9/TestCompleteLearning/NotePad/Script/bb.sj
	TestComplete9/TestCompleteLearning/NotePad/Script/master_notepad.sj
	TestComplete9/TestCompleteLearning/TestCompleteLearning.tcCfgExtender
	cc.sj
	encoding
aa
Merge branch 'topic-notepad'

Conflicts:
	TestComplete9/TestCompleteLearning/NotePad/Script/bb.sj