display of pivot STD
merge conflict
Merge branch 'master' of https://github.com/beeber/GPA
adding type, and accordions
Merge branch 'master' of https://github.com/beeber/GPA