Reverted back to tzoof's version before last merge
Merge branch 'master' of https://github.com/tzoof/mtm_hw5_pq

Conflicts:
	hw5_PQ/group.h