added list of ingredients
resolve merge conflict
added notes. completed coding