Light and heavy baryon masses : the 1/N sub C expansion and the quark model