afdasd
Merge branch 'master' of github.com:WebValley2014/WebDev

Conflicts:
	WebDev/WebDev/forms.pyc
	WebDev/WebDev/settings.pyc
	WebDev/WebDev/urls.pyc
	WebDev/WebDev/views.pyc
	WebDev/classification/urls.pyc
	WebDev/classification/views.pyc
	WebDev/preprocess/views.pyc