Move depending on status
Merge branch 'master' of https://github.com/19thhell/Tetris

Conflicts:
	display
	display.cpp
Move depending on status