Nested layouts to reposition grid
Merge branch 'Other'

Conflicts:
	tictactoe.java