Shape + State.putShape implementace
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/com/czechscala/tetris/model.scala