To do a Punnett square with two traits, simply define possible parent gametes and match them together. You should have 16 small boxes within your larger Punnett square.