Correct use of the comma.

There is no right answer. Both forms are acceptable. The last item in a list may or may not have a comma, it's up to the writer.
http://en.wikipedia.org/wiki/Oxford_comma

I only know this because it's a style issue with wikis and you have to try to keep it the same way throughout the page.