Use ffmpeg instead of avconv
Use port 80 instead of 8082
Merge pull request #1 from vvandonselaar-aa/load_custom_files

Load custom files from disk when needed.
Fixed Rolf's fsck'up.
Another....
Merge branch 'master' into load_custom_files

Conflicts:
	server.py