kill term
Merge branch 'master' of http://github.com/Alexandertyler/piVideoStream

merge