merge
Merge branch 'master' of github.com:Coppolaemilio/Stellar

Conflicts:
	config.ini
reverted ini