before merge
Merge remote-tracking branch 'origin/Single' into Single

Conflicts:
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/Play$1.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/Play$2.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/Play$3.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/Play.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/R$raw.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/R$string.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/R$style.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/R$xml.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/Stat$MyAdapter.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/Stat$ViewHolder.class
	PuzzleJigsaw/bin/classes/com/example/puzzlejigsaw/Stat.class
	PuzzleJigsaw/gen/com/example/puzzlejigsaw/R.java
	PuzzleJigsaw/src/com/example/puzzlejigsaw/Play.java
	PuzzleJigsaw/src/com/example/puzzlejigsaw/Stat.java