cell flop not work
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/triple/game/grid/Cell.java
cell flop not work