A Commit
Merge branch 'master' of https://github.com/d-mon-/brookesTeam5.git

Conflicts:
	Garage/derby.log
	Garage/src/com/brookes/garage/controller/CustomerModuleController.java
	Garage/src/com/brookes/garage/frame/CustomerDetailsFrame.java