some change
a merge
Merge branch 'master' of github.com:longfei-wang/mightyscreen

Conflicts:
	process/templates/process/upload.html