Python 3 support
Merge branch 'master' of github.com:K900/Stellar

Conflicts:
	config.ini