лог миррор
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/gamelogic/tictactoe/TicTacToe.java
	app/views/Application/index.html