file upload
Merge branch 'master' of https://github.com/larsbutzmann/v0ice

Conflicts:
	client/v0ice.js