Classification Upload Finished
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebDev/classification/templates/classification/option.html
	WebDev/classification/views.py
Classification Upload Finished