Merge branch 'master' of C:\Android\workspace\KenKen with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	AndroidManifest.xml
	src/kenken/com/MainActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	AndroidManifest.xml
	res/layout/activity_main.xml
	src/kenken/com/MainActivity.java
Fragment settings