update settings to include lipid17_merged

Author: atravitz

cookbook/choose_protocol.ipynb

@@ -324,7 +324,8 @@
     "            'amber/ff14SB.xml',\n",
     "            'amber/tip3p_standard.xml',\n",
     "            'amber/tip3p_HFE_multivalent.xml',\n",
-    "            'amber/phosaa10.xml'\n",
+    "            'amber/phosaa10.xml',\n",
+    "            'amber/lipid17_merged.xml',\n",
     "        ],\n",
     "        \n",
     "        # Small molecule force field to use with OpenMM template generator:\n",