A507
Merge branch 'master' of https://github.com/NuXareon/CDI

Conflicts:
	A507-Millas.py