There are some things that I don't think look good that I think you either missed or just haven't gotten to yet. That's okay, we can discuss. But this is most def merge-able.
Just kidding. We don't need style-orig.css. Just the new style.css. We can get the "original" (the definition of original will be constantly changing) at this point in time by using git.
It looks good to me. This is merge-able.
There are some things that I don't think look good that I think you either missed or just haven't gotten to yet. That's okay, we can discuss. But this is most def merge-able.