Updated oneBounce twoBounce and bounce fns
fixed conflict issues.
removed.
Merge branch 'jenevans33-master'