done with S4!
Merge branch 'master' of github.com:resource-reasoning/CoLoSL

Conflicts:
	CoLoSL-POPL2015/Sections/Logic/logic.tex