Which career/degree is the one im looking for, oceanography or marine biology?

Ok, so ive decided to go back to school and i know that i want to work with and within the ocean/water. But i dont really know the difference between Oceanography and Marine Biology, i did look it up but they both seem pretty much the same to me. so heres what i want to do once i graduate, i want to study sea life and organisms, currents, effects brought on by water tempetures, work with corals and different underwater plants, possibly discover a new speices. now when i looked up the difference it seemed that both had those and at the sametime none of that… so i ask you dear futherers which is the best for me to take for what im looking for in the end. if you have a degree in one or the other or both PLEASE help me out.