modified:   NumPyMerge.py
	modified:   tests/test_merge.py
Merge branch 'develop' of github.com:yishenggudou/logparse into develop

Conflicts:
	LogParse/NumPyMerge.py