Initial commit
Merge branch 'master' of https://github.com/tiphedor/Tetris_android

Conflicts:
	.gitignore
Initial commit