Pretty pissed off

Dont know what has happed but someone  merged something and it screwed
my file.... trying to fix it
Merge branch 'master' of https://github.com/cameronwagstaff/Tetris

Conflicts:
	Piece.cpp
	Piece.h
I fixed the problem i created

fixed the merge crap that i caused .....its almost 4:00 i'm going to bed
now.