Uploaded the rest of the files... Oops.
Merge branch 'master' of https://github.com/stuydw/matrix