recipe tiles now added dynamically with jquery
fixed merge conflict