sad
Merge branch 'master' of https://github.com/popotans/hjnassist

Conflicts:
	Helper/bin/Debug/Helper.dll
	Helper/bin/Debug/Helper.pdb
	WebApplication1/bin/Helper.dll
	WebApplication1/bin/Helper.pdb
Merge branch 'master' of https://github.com/popotans/hjnassist

Conflicts:
	Helper.suo
AS