merge
Merge branch 'master' of github.com:eldersantos/gpam
merge
Conflicts:
	mlp.py
changes