moved some javascript around
fixed merge conflicts
trying to change duplicate igredients
fixed merged conflicts