change 1 to branch_2
yet another change.
another change
half functional button
show hide test
added gui non functional search bar
reworked connection
Merge remote-tracking branch 'origin/branch_2' into branch_2

Conflicts:
	CSR Order GUI/__pycache__/csrLogic.cpython-33.pyc
	CSR Order GUI/__pycache__/queries.cpython-33.pyc
working singular design info button e thing
semi workin search bar
updated search button to use same methode as design button.
add cnx file
cnx file addition
db mods to button data stuff
Merge branch 'branch_2_search_bar_hoy' into branch_2_search_bar

Conflicts:
	CSR Order GUI/__pycache__/csrLogic.cpython-33.pyc
	CSR Order GUI/__pycache__/queries.cpython-33.pyc
	CSR Order GUI/csr_gui.py
output design info to docked text edit
add home and undo button, changed query and query logic
Merge branch 'branch_2_search_bar_db_stuff' into branch_2_search_bar_db

Conflicts:
	CSR Order GUI/__pycache__/csrLogic.cpython-33.pyc
	CSR Order GUI/__pycache__/queries.cpython-33.pyc
	CSR Order GUI/csrLogic.py
	CSR Order GUI/csr_gui.py
	CSR Order GUI/queries.py
changed size of MainWindow and set minimum widths for dock widgets.
wtf