committing changes
merge completed
committing stream.h so I can pull
resolved merging conflicts
pushing most recent update