Commit changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	algorithms/GA.py
Merge branch 'master' of https://github.com/thovo/aa_practice_project

Conflicts:
	algorithms/GA.py
Merge remote-tracking branch 'origin/master'