change on console
comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	INN570 Assessment2/INN570_Assessment2/FuzzyMatch.cs
	INN570 Assessment2/INN570_Assessment2/ResxManager.cs
	INN570 Assessment2/INN570_Assessment2/frmTranslator.cs