try to commit
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	TicTacToe/TicTacToe/Views/Index/Index.cshtml
try to commit 2