Ok
Merge branch 'master' of https://github.com/Svenseirb/pr-compil

Conflicts:
	parse.y
	rubic
	test
	y.tab.c