add matrix
Merge branch 'master' of https://github.com/epha/pharmaceuticals

Conflicts:
	modules/download.js