Rollback.
Merge branch 'master' of github.com:cassiel/codezoners

Conflicts:
	week-10/js/calc.js
Type.