Added matrix multiplication
Added matrix multiplication, merged code