Changes for TMX Files
Merge remote-tracking branch 'origin/master'

Conflicts:
	INN570 Assessment2/INN570_Assessment2/INN570_Assessment2.csproj
	INN570 Assessment2/INN570_Assessment2/bin/Debug/INN570_Assessment2.exe
	INN570 Assessment2/INN570_Assessment2/bin/Debug/INN570_Assessment2.pdb
	INN570 Assessment2/INN570_Assessment2/frmTranslator.Designer.cs
	INN570 Assessment2/INN570_Assessment2/frmTranslator.cs
	INN570
Assessment2/INN570_Assessment2/obj/Debug/INN570_Assessment2.csproj.GenerateResource.Cache
	INN570 Assessment2/INN570_Assessment2/obj/Debug/INN570_Assessment2.exe
	INN570 Assessment2/INN570_Assessment2/obj/Debug/INN570_Assessment2.pdb