added genericQmat
syncing up changes in submodules
Merge branch 'develop' of https://github.com/es335mathwiz/mathAMA into develop