sr
Merge branch 'master' of https://github.com/johnmoore/iOStream

Conflicts:
TestProject/Downtyme/SRScreenRecorder.m
conflict