a
Merge branch 'master' of https://github.com/Jeronics/CBR-system

Conflicts:
	Code/main.py