Merge pull request #70 from wdlindmeier/developBill

Refactored timing and random to sync across screens
Bug Fixin