Commit
result conflict
resolve error
Merge branch 'master' of https://github.com/WebValley2014/WebDev

Conflicts:
	WebDev/.gitignore
	WebDev/WebDev/__init__.pyc
	WebDev/WebDev/wsgi.pyc
	WebDev/classification/__init__.pyc
	WebDev/network/__init__.pyc
	WebDev/preprocess/__init__.pyc