some stuff
Merge branch 'master' of github.com:kisonecat/m2o2c2

Conflicts:
	week1/functions/composition.tex