now using include.sComponets, include.literal, include.gComponents
Merge branch 'master' of https://github.com/mslegrand/pegr

Conflicts:
	sComponents.r
something funky with sComponents
merge scomponents (fixed some conflicts)