Which is better.iPhone 4 or 4s?

So i have the iPhone 3G haha ikr lame! But the point is which is better for an upgrade I'm getting the iPhone 4 or the 4s and i want to know which is better my popular friend Chelsea said the iPhone 4s and i didn't hear the rest of the sentence so which one?
explain=)

THE IPHONE 4S IS BETTER. IT WAS ACTUALLY MADE TO RECTIFY PROBLEMS REPORTED ABOUT THE IPHONE 4.

The 4S of course.

Faster, better equipped than the 4.