modified prop control again
Merge branch 'master' of https://github.com/krobertson92/realtime