Fixed Textures almost completely
Blahhh
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
Commit
Trying to get this working

Didn't change anything
Merge remote-tracking branch 'origin/Greg' into Andrew

Conflicts:
	Debug/Project4.exe
	Debug/Project4.ilk
	Debug/Project4.pdb
	Project4.sdf
	Project4.v12.suo
	Project4/Debug/Camera.obj
	Project4/Debug/Card.obj
	Project4/Debug/Deck.obj
	Project4/Debug/Game.obj
	Project4/Debug/Object.obj
	Project4/Debug/PlayDeck.obj
	Project4/Debug/Player.obj
	Project4/Debug/Project4.log
	Project4/Debug/Project4.tlog/CL.read.1.tlog
	Project4/Debug/Project4.tlog/CL.write.1.tlog
	Project4/Debug/Project4.tlog/link.read.1.tlog
	Project4/Debug/Project4.tlog/link.write.1.tlog
	Project4/Debug/StandardDeck.obj
	Project4/Debug/Texture.obj
	Project4/Debug/World.obj
	Project4/Debug/main.obj
	Project4/Debug/vc120.idb
	Project4/Debug/vc120.pdb
added files
Revert "Trying to get this working"

This reverts commit 408e94f3a47e504b0d7a69453e41b8dfef1e6664.

Conflicts:
	Debug/Project4.exe
	Debug/Project4.ilk
	Debug/Project4.pdb
	Project4.sdf
	Project4.v12.suo
	Project4/Debug/Camera.obj
	Project4/Debug/Card.obj
	Project4/Debug/Deck.obj
	Project4/Debug/Game.obj
	Project4/Debug/Object.obj
	Project4/Debug/PlayDeck.obj
	Project4/Debug/Player.obj
	Project4/Debug/Project4.log
	Project4/Debug/Project4.tlog/CL.read.1.tlog
	Project4/Debug/Project4.tlog/CL.write.1.tlog
	Project4/Debug/Project4.tlog/link.read.1.tlog
	Project4/Debug/Project4.tlog/link.write.1.tlog
	Project4/Debug/StandardDeck.obj
	Project4/Debug/Texture.obj
	Project4/Debug/World.obj
	Project4/Debug/main.obj
	Project4/Debug/vc120.idb
	Project4/Debug/vc120.pdb
Huge Commit
Minor updates
Changes to "WAR" animation
Added the table
Modified Some of the Tables Faces to make retexturing easier.
Merge remote-tracking branch 'origin/Greg' into Greg

Conflicts:
	Project4.sdf
	Project4.v12.suo
Added Shadow Map Class
Merge pull request #3 from ajjoyal01/Greg

Greg