Added feeding fish to salamander, and removed redundant end options from conversations.js, now added automatically