button2
Merge branch 'development'

Conflicts:
	TicTacToeGitTest/MainWindow.ui