Okay fixed the conflicts, pictures kind of working
recomitting tests
layout for add new recipe pic