upload.html is done.
Merge branch 'master' of github.com:fredfsh/fantasy