Merging stuff.
Merge branch 'master' of
https://github.com/jamestlynch/CSCI201_Team_FinalProject.git

Conflicts:
	src/main/automobile/Automobile.java