reverted back to iteration 2 commit master
Merge branch 'master' of https://github.com/SmartTrolley/SmartTrolleyMainCode

Conflicts:
	SmartTrolley/src/DatabaseConnectors/SqlConnection.java
	SmartTrolley/src/DatabaseConnectors/SqlConnectionTest.java
	SmartTrolley/src/DatabaseConnectors/package-info.java
	SmartTrolley/src/tests/AllShoppingListsScreenControllerTest.java
	SmartTrolley/src/tests/FilterProductsTest.java
	SmartTrolley/src/tests/ProductsToLists.java