x
Merge branch 'master' of https://github.com/Kyle27Lee/3D-Modeling

Conflicts:
	Maya/images/tmp/Jeep2.png
dlt