f2 feature
t2 added
merged with master
fix hello
merge with f1
fix hello
Merge branch 'master' of https://github.com/yariyarov/tetris

Conflicts:
	ghtest.txt
add f1
Merge branch 'f1'
Merge remote-tracking branch 'origin/f2'

Conflicts:
	ghtest.txt
Merge branch 'master' of https://github.com/yariyarov/tetris.git

Conflicts:
	ghtest.txt