code change
code update
code change
xxx
Revert "xxx"

This reverts commit f80f7c1b0013d17c80008366638323c6d5483b8c.
code update
code update
code update
code change
code update

except tldNN, almost done
Merge remote-tracking branch 'origin/lrt' into test

Conflicts:
	code/ourTLD/ourTLD/Config.h
	code/ourTLD/ourTLD/matrix.cpp
	code/ourTLD/ourTLD/matrix.h

	modified:   code/ourTLD/ourTLD/bbox.cpp
	modified:   code/ourTLD/ourTLD/bbox.h
	modified:   code/ourTLD/ourTLD/common.h
	new file:   code/ourTLD/ourTLD/img1.png
	new file:   code/ourTLD/ourTLD/img2.png
	new file:   code/ourTLD/ourTLD/lk.cpp
	new file:   code/ourTLD/ourTLD/lk.h
	new file:   code/ourTLD/ourTLD/main.cpp
	modified:   code/ourTLD/ourTLD/matrix.cpp
	modified:   code/ourTLD/ourTLD/matrix.h
	new file:   code/ourTLD/ourTLD/test.cpp
	modified:   code/ourTLD/ourTLD/tld.h
	modified:   code/ourTLD/ourTLD/tracking.cpp
	modified:   code/ourTLD/ourTLD/tracking.h