Merge branch 'DigitalSignage-develop' into DigitalSignage
Fixing errors from merge regarding Pi playback
Merged upstream
Merge branch 'DigitalSignage-develop' of https://github.com/brhoads/VADER into DigitalSignage
Commit to pull, nothing seems to have changed
Merging to Desktop