Added libraries and removed text from merge conflicts

I added all the libraries I reference to the lib folder and removed the
extra text in most of the gvaneyck\rtmp files caused by an earlier merge
I performed.