updated stuff
Merge branch 'master' of github.com:helios2k6/Transcoding-Service