all together, still buggy
merging with all together code

Merge branch 'master' of https://github.com/mkennedy3000/x265