Strassen
Merge branch 'master' of https://github.com/kasper0406/AlgEng

Conflicts:
	project2/main.cpp
	project2/matrixmul.h
	project2/test.h