merge commit
Merge branch 'MatBugOwen' of https://github.com/porglezomp/graphicsmath into MatBugOwen

Conflicts:
	src/mat3.cpp
Merge branch 'MatBugOwen' of https://github.com/porglezomp/graphicsmath into MatBugOwen