Merged cocktails with foods
Added canister bombs
Misc other things
Update index