p-adic numbers +,-,* integers
Resolve conflict

Conflicts:
	MumfordCurves/pAdic.m2