Pass simulator to car.

Conflicts:
	Data Structures/Assignment 2/DS -
Assignment2/src/Assignment2/Group.java
	Data Structures/Assignment 2/DS -
Assignment2/src/Assignment2/User.java
	Data Structures/Assignment 2/DS -
Assignment2/src/Assignment2/Whatsapp.java
gpsMerge branch 'master' of https://github.com/Moo64c/cs