changed up winning conditions a little
cleared conflicts

Conflicts:
	TicTactoe.html