testing
Merge branch 'master' of github.com:ylang/18-641Java

Conflicts:
	CarConfig/src/automotive/Controller.java
parse and serialize