asdasd
Finish nuevo_p
Finish release-2

Conflicts:
	readme.txt
adasd
Finish nuevo_p1
updating poms for 1.0.0 release
updating poms for 1.0.0 release
Merge branch 'release/1.0.0'

Conflicts:
	readme.txt