Changed bikerstream files to handle merge conflicts from East Coast

Replaced some content that got lost in the merge with the East Coast
branch