start
Merge branch 'master' of https://github.com/wuwing/learning-tetris

Conflicts:
	tetris.cpp