1) Loosen the clamp bolt for the FD and raise it up so that the cage sits about 1-3mm above the big ring.

2) Tighten that clamp back down; It sounds like it slipped when you shifted. No big deal

The person who put the bike together for you just didn't tighten it enough. If the frame was just waxed, that can really contribute to the problem. I've used a rubber "shim" made from a piece of innertube as a ghetto fix before.