added foo & bar
jerbs
Humberstream Conflict Resolved