sync backup

on csil linux workstation
Merge branch 'master' of https://github.com/jejekule/tetris

Conflicts:
	a01
	main.cpp