db 3rd change
commit after compare
Merge branch 'rowsWorking' of
https://github.com/Ink-Pixi/csr-order-tool.git into rowsWorking

Conflicts:
	CSR Order GUI/connection.py