finalized build
finalized build
Merge branch 'master' of github.com:thang1thang2/Asn6

Conflicts:
	jared.weakly.cpp