I would highly recommend you look in to Lightroom, as I'm sure many others would also suggest. It is awesome for simple editing, raw conversion, and organization. photoshop is great too, and if you want to do video as well, you might as well get cs6 production premium or master collection. One of my favorite things about it is how well everything works together. I can import my photos to lightroom, edit 1 then sync the settings, then send them all to photoshop to do a panorama, and it is so easy.