You should be eating at least your body weight in GM's of protein, you can go even higher, 1.5x. Like Matt said, you should either be bulking or cutting. One or the other. You want to bulk and then cut. If you eat clean, and workout hard, some fat will come off natually anyhow.
I would eat clean fats like peanut butter, almonds, olive oil etc.
You probably have a very high metabolism, so you can probably be pretty generous on your carbs. If I were you I would do a 40-40-20, Protein, carbs, fat.
It's important that if you are going in increase your calories, that you go hard at lifting weights in the gym. Otherwise, you'll just get fat.
Make sure to drink at least a gallon of water a day. it sounds like alot, but it's basically (8) 16oz bottles of poland spring water. No soda, or anything else to drink.
I would stay away from cardio, or do very light cardio, no more than 20 min.