3.1
Merge branch 'master' of github.com:resource-reasoning/CoLoSL

Conflicts:
	CoLoSL-POPL2015/Sections/SemanticsAndSoundness/semantics.tex