makefile commit
Merge branch 'master' of https://github.com/droffset/x264streaming