resolution picking done
strange connection error
sending correct settings
removed unneeded comment code
video files renamed
Merge branch 'master' into rtp