Upload is working!

I will add a progress bar.
Merge remote-tracking branch 'origin/master'

Conflicts:
	challenge.py
	template/completions.html
	urls.py