lots of updates
Merge branch 'master' of https://github.com/grudy/GSOC

Conflicts:
	m1rigf3/m1rigf3.h
	subractiong_gf3_proofofconcept.c