RAS
Merge branch 'master' of https://github.com/AlexandreSteward/pythonProject

Conflicts:
	connection.py