Testing conflicts
Merge branch 'master' of
https://github.com/SmartTrolley/SmartTrolleyMainCode.git

Conflicts:
	SmartTrolley/src/client/SmartTrolleyTests.java