Fix errors in Functor and Strassen
Merge branch 'master' of github.com:aksharbonu/CS51-Final-Project
Fix Merge Conflict