updated collision mechanism
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/scaatis/rrr/Car.java
Various fixes