sat night
Merge branch 'master' of https://github.com/stablum/soa

Conflicts:
	config.py