r2
Merge branch 'master' of https://github.com/feantot/potencia

Conflicts:
	analysis.R
	init.R
	model.R