jf
Merge branch 'master' of https://github.com/TimmyGChi/Cogs187a-Final-Project

Conflicts:
	OurTrucks.html