Unpartioning a hard drive

Okay i partitioned my macbooks hard drive, the main drive, and a 10 gig partition for misc files, mostly word files. I want to install bootcamp so i can run some games i am working on, but when i went to the bootcamp assistant. It said :" The startup disk cannot be partitioned or restored to a single partition. The startup disk must be formatted as a single mac )S Extended (journaled) volume or already partitioned by Bootcamp Assistant for installing Windows "

How can i restore the partition to the main drive?

I believe you can use Disk Utility to manage the partitions. Delete the ones you don't want, resize back to a full OS X partition, then use the Bootcamp Assistant to create one for Windows.