ojuiojhio
Merge branch 'master' of https://github.com/beaCarre/CPS-RCR

Conflicts:
	Spec/spec.log
	Spec/spec.pdf
	Spec/spec.synctex.gz