Testing github
New view - TabbedVehicleFrame
Testing github
Test github
Stashing before git hub merge
Merge branch 'master' of
https://github.com/MashimarroDuckface/car_l_marx

Conflicts:
	src/controller/VehicleController.java
	src/views/VehicleFrame.java