obssub
Merge branch 'master' of https://github.com/rfreitas/bricks

Conflicts:
	Bricks.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/rfreitas/bricks
composite pattern, bitches!!
Merge branch 'master' of https://github.com/rfreitas/bricks

Conflicts:
	Game.cpp