aoe works properly
Merge branch 'master' of https://github.com/samsath/Colonise

Conflicts:
	src/main.py