and, or usage in sentence

Your assumption is correct; it does mean 'either or both.' However, it's normally written with a slash instead of a comma:

and/or