last updates
Solving conflict ?
Merge branch 'master' of https://github.com/r1d1/calculosedergosum

Conflicts:
	README.md