Finalizing

Finalizing commit after 4 x 4 mode was done.
Finalizing2
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/intermediates/classes/debug/com/sachinda/myfirstapp/FourInToFourTwoPlayer.class
	build/intermediates/classes/debug/com/sachinda/myfirstapp/OnePlayerActivity.class
	build/intermediates/classes/debug/com/sachinda/myfirstapp/OnePlayerActivity2.class
	build/intermediates/classes/debug/com/sachinda/myfirstapp/OnePlayerActivity3.class
	build/intermediates/classes/debug/com/sachinda/myfirstapp/OnePlayerActivity4.class
	build/intermediates/classes/debug/com/sachinda/myfirstapp/OnePlayerActivity5.class
	build/intermediates/classes/debug/com/sachinda/myfirstapp/OnePlayerActivity6.class
	build/intermediates/classes/debug/com/sachinda/myfirstapp/R$id.class
	build/intermediates/classes/debug/com/sachinda/myfirstapp/TwoPlayerActivity.class
	build/intermediates/dex/debug/classes.dex
	build/intermediates/incremental/mergeResources/debug/merger.xml
	build/intermediates/res/debug/layout/activity_four_in_to_four_two_player.xml
	build/outputs/apk/TicTacToe-debug-unaligned.apk
	build/outputs/apk/TicTacToe-debug.apk
	res/layout/activity_four_in_to_four_two_player.xml