update matrix && square
SCARY!!!!!!!!
Merge branch 'master' of https://github.com/cameronwagstaff/Tetris

Conflicts:
	Piece.cpp
	Piece.h