Fixed Textures almost completely
Merge remote-tracking branch 'origin/Greg' into Andrew

Conflicts:
	Project4/Models/2_clubs.obj
	Project4/Models/2_diamonds.mtl
	Project4/Models/2_diamonds.obj
	Project4/Models/2_hearts.mtl
	Project4/Models/2_hearts.obj
	Project4/Models/2_spades.mtl
	Project4/Models/2_spades.obj
	Project4/Models/3_clubs.mtl
	Project4/Models/3_clubs.obj
	Project4/Models/3_diamonds.mtl
	Project4/Models/3_diamonds.obj
	Project4/Models/3_hearts.mtl
	Project4/Models/3_hearts.obj
	Project4/Models/3_spades.mtl
	Project4/Models/3_spades.obj
	Project4/Models/4_clubs.mtl
	Project4/Models/4_clubs.obj
	Project4/Models/4_diamonds.mtl
	Project4/Models/4_diamonds.obj
	Project4/Models/4_hearts.mtl
	Project4/Models/4_hearts.obj
	Project4/Models/4_spades.mtl
	Project4/Models/4_spades.obj
	Project4/Models/5_clubs.mtl
	Project4/Models/5_clubs.obj
	Project4/Models/5_diamonds.mtl
	Project4/Models/5_diamonds.obj
	Project4/Models/5_hearts.mtl
	Project4/Models/5_hearts.obj
	Project4/Models/5_spades.mtl
	Project4/Models/5_spades.obj
	Project4/Models/6_clubs.mtl
	Project4/Models/6_clubs.obj
	Project4/Models/6_diamonds.mtl
	Project4/Models/6_diamonds.obj
	Project4/Models/6_hearts.mtl
	Project4/Models/6_hearts.obj
	Project4/Models/6_spades.mtl
	Project4/Models/6_spades.obj
	Project4/Models/7_clubs.mtl
	Project4/Models/7_clubs.obj
	Project4/Models/7_diamonds.mtl
	Project4/Models/7_diamonds.obj
	Project4/Models/7_hearts.mtl
	Project4/Models/7_hearts.obj
	Project4/Models/7_spades.mtl
	Project4/Models/7_spades.obj
	Project4/Models/8_clubs.mtl
	Project4/Models/8_clubs.obj
	Project4/Models/8_diamonds.mtl
	Project4/Models/8_diamonds.obj
	Project4/Models/8_hearts.mtl
	Project4/Models/8_hearts.obj
	Project4/Models/8_spades.mtl
	Project4/Models/8_spades.obj
	Project4/Models/9_clubs.mtl
	Project4/Models/9_clubs.obj
	Project4/Models/9_diamonds.mtl
	Project4/Models/9_diamonds.obj
	Project4/Models/9_hearts.mtl
	Project4/Models/9_hearts.obj
	Project4/Models/9_spades.mtl
	Project4/Models/9_spades.obj
	Project4/Models/ace_clubs.mtl
	Project4/Models/ace_clubs.obj
	Project4/Models/ace_diamonds.mtl
	Project4/Models/ace_diamonds.obj
	Project4/Models/ace_hearts.mtl
	Project4/Models/ace_hearts.obj
	Project4/Models/ace_spades.mtl
	Project4/Models/ace_spades.obj
	Project4/Models/jack_clubs.mtl
	Project4/Models/jack_clubs.obj
	Project4/Models/jack_diamonds.mtl
	Project4/Models/jack_diamonds.obj
	Project4/Models/jack_hearts.mtl
	Project4/Models/jack_hearts.obj
	Project4/Models/jack_spades.mtl
	Project4/Models/jack_spades.obj
	Project4/Models/king_clubs.mtl
	Project4/Models/king_clubs.obj
	Project4/Models/king_diamonds.mtl
	Project4/Models/king_diamonds.obj
	Project4/Models/king_hearts.mtl
	Project4/Models/king_hearts.obj
	Project4/Models/king_spades.mtl
	Project4/Models/king_spades.obj
	Project4/Models/queen_clubs.mtl
	Project4/Models/queen_clubs.obj
	Project4/Models/queen_diamonds.mtl
	Project4/Models/queen_diamonds.obj
	Project4/Models/queen_hearts.mtl
	Project4/Models/queen_hearts.obj
	Project4/Models/queen_spades.mtl
	Project4/Models/queen_spades.obj