"John Doe, who has a master's degree in psychology." is the proper usage of the apostrophe. Also: you don't capitalize "master's"
Its Master's degree. anywhere you look it will come up Master's even if you type in Master. Also my aunt is a lawyer and I asked her, I even looked it up in the new Collage Webster Dictionary so it...
master's degree