debug

debug
Merge branch 'master' of https://github.com/xingdi-eric-yuan/conv-net-version-3

Conflicts:
	README.md