Merge remote-tracking branch 'origin/Greg' into Greg

Conflicts:
	Models/10_of_clubs.obj
	Models/10_of_diamonds.obj
	Models/10_of_hearts.obj
	Models/10_of_spades.obj
	Models/2_of_clubs.obj
	Models/2_of_diamonds.obj
	Models/2_of_hearts.obj
	Models/2_of_spades.obj
	Models/3_of_clubs.obj
	Models/3_of_diamonds.obj
	Models/3_of_hearts.obj
	Models/3_of_spades.obj
	Models/4_of_clubs.obj
	Models/4_of_diamonds.obj
	Models/4_of_hearts.obj
	Models/4_of_spades.obj
	Models/5_of_clubs.obj
	Models/5_of_diamonds.obj
	Models/5_of_hearts.obj
	Models/5_of_spades.obj
	Models/6_of_clubs.obj
	Models/6_of_diamonds.obj
	Models/6_of_hearts.obj
	Models/6_of_spades.obj
	Models/7_of_clubs.obj
	Models/7_of_diamonds.obj
	Models/7_of_hearts.obj
	Models/7_of_spades.obj
	Models/8_of_clubs.obj
	Models/8_of_diamonds.obj
	Models/8_of_hearts.obj
	Models/8_of_spades.obj
	Models/9_of_clubs.obj
	Models/9_of_diamonds.obj
	Models/9_of_hearts.obj
	Models/9_of_spades.obj
	Models/ace_of_clubs.obj
	Models/ace_of_diamonds.obj
	Models/ace_of_hearts.obj
	Models/ace_of_spades.obj
	Models/ace_of_spades2.obj
	Models/back.obj
	Models/black_joker.obj
	Models/jack_of_clubs.obj
	Models/jack_of_clubs2.obj
	Models/jack_of_diamonds.obj
	Models/jack_of_diamonds2.obj
	Models/jack_of_hearts.obj
	Models/jack_of_hearts2.obj
	Models/jack_of_spades.obj
	Models/jack_of_spades2.obj
	Models/king_of_clubs.obj
	Models/king_of_clubs2.obj
	Models/king_of_diamonds.obj
	Models/king_of_diamonds2.obj
	Models/king_of_hearts.obj
	Models/king_of_hearts2.obj
	Models/king_of_spades.obj
	Models/king_of_spades2.obj
	Models/queen_of_clubs.obj
	Models/queen_of_clubs2.obj
	Models/queen_of_diamonds.obj
	Models/queen_of_diamonds2.obj
	Models/queen_of_hearts.obj
	Models/queen_of_hearts2.obj
	Models/queen_of_spades.obj
	Models/queen_of_spades2.obj
	Models/red_joker.obj

Updated Objects
Merge branch 'Greg' of https://github.com/ajjoyal01/Project4 into Greg

Conflicts:
	Models/10_of_clubs.obj
	Models/10_of_diamonds.obj
	Models/10_of_hearts.obj
	Models/10_of_spades.obj
	Models/2_of_clubs.obj
	Models/2_of_diamonds.obj
	Models/2_of_hearts.obj
	Models/2_of_spades.obj
	Models/3_of_clubs.obj
	Models/3_of_diamonds.obj
	Models/3_of_hearts.obj
	Models/3_of_spades.obj
	Models/4_of_clubs.obj
	Models/4_of_diamonds.obj
	Models/4_of_hearts.obj
	Models/4_of_spades.obj
	Models/5_of_clubs.obj
	Models/5_of_diamonds.obj
	Models/5_of_hearts.obj
	Models/5_of_spades.obj
	Models/6_of_clubs.obj
	Models/6_of_diamonds.obj
	Models/6_of_hearts.obj
	Models/6_of_spades.obj
	Models/7_of_clubs.obj
	Models/7_of_diamonds.obj
	Models/7_of_hearts.obj
	Models/7_of_spades.obj
	Models/8_of_clubs.obj
	Models/8_of_diamonds.obj
	Models/8_of_hearts.obj
	Models/8_of_spades.obj
	Models/9_of_clubs.obj
	Models/9_of_diamonds.obj
	Models/9_of_hearts.obj
	Models/9_of_spades.obj
	Models/ace_of_clubs.obj
	Models/ace_of_diamonds.obj
	Models/ace_of_hearts.obj
	Models/ace_of_spades.obj
	Models/ace_of_spades2.obj
	Models/back.obj
	Models/black_joker.obj
	Models/jack_of_clubs.obj
	Models/jack_of_clubs2.obj
	Models/jack_of_diamonds.obj
	Models/jack_of_diamonds2.obj
	Models/jack_of_hearts.obj
	Models/jack_of_hearts2.obj
	Models/jack_of_spades.obj
	Models/jack_of_spades2.obj
	Models/king_of_clubs.obj
	Models/king_of_clubs2.obj
	Models/king_of_diamonds.obj
	Models/king_of_diamonds2.obj
	Models/king_of_hearts.obj
	Models/king_of_hearts2.obj
	Models/king_of_spades.obj
	Models/king_of_spades2.obj
	Models/queen_of_clubs.obj
	Models/queen_of_clubs2.obj
	Models/queen_of_diamonds.obj
	Models/queen_of_diamonds2.obj
	Models/queen_of_hearts.obj
	Models/queen_of_hearts2.obj
	Models/queen_of_spades.obj
	Models/queen_of_spades2.obj
	Models/red_joker.obj
Merge remote-tracking branch 'origin/Greg' into Andrew