typo
OSError for existing folder
OSError for existing folder
typo
working, hacky ffmpeg thing
mov in email
Merge branch 'master' of github.com:bmwang/cnm_scripts

Conflicts:
	server/receive.py
new ffmpeg version, also delete temp dir