third commit
Merge branch 'master' of https://github.com/Xiaojuanmao/UniqueTest_4
Merge branch 'master' of https://github.com/Xiaojuanmao/UniqueTest_4

Conflicts:
	CarInstrumentSystemGUI.java
	CarInstrumentSystemGUI.java~
	CarInstrumentSystemPD.java