Merge branch 'master' of https://github.com/ObaNaN/MASI-MASO

Conflicts:
	.project
	src/Car.java
	src/ImplServer.java
	src/MainServer.java