Changed Assert methods in CurveTest to TestNG Asserts
Implemented edwards 1and1 test
Merge branch 'master' of https://github.com/BjornArnelid/ed25519

Conflicts:
	src/ed25519/test/CurveTest.java