Syncing uncommitted changes to update branch
Merge remote-tracking branch 'origin/master'

Conflicts:
	TicTacToe.v12.suo