add different
test conflicts

Merge branch 'master' of https://github.com/BrianAlan/TestMd5

Conflicts:
	TestMd5/src/com/zkq/activity/TestMd5Activity.java