Merge branch 'master' of https://github.com/Yimei/HWERD

Conflicts:
	102598058.sdf
	102598058_ERD_UnitTesting/102598058_ERD_UnitTesting.vcxproj
	Win32/Debug/102598058_ERD.exe
	Win32/Debug/102598058_ERD.ilk
	Win32/Debug/102598058_ERD.pdb