Changed streamD to be 2 classes.
Merge branch 'master' of https://github.com/knakke3/ioF14