.
Merge branch 'master' of https://github.com/catalandres/catalandres.github.io

Conflicts:
	msom3101-s2014.html