created new order ingredients page and added amount needed
changed color from gray to blue
updated stuff
updated and fixed merging