HAI GAIZ I FIXED DA CRASHEZ.
added ability to make rectangles, anything that uses rectangles and is commented can be taken out.
updated xml
Merge commit '778f57922566f733fb1c6daad1a0bbb3e529dc53' into aaron_mac

Conflicts:
	Field1.xcodeproj/project.pbxproj
	bin/data/LEVELS/level_1.xml
	src/GameScreen.cpp
	src/GlobalCollisionListner.cpp
	src/Screen.h
Merge commit 'd0c68297f189a90d63ed652a79788f3956cdeac9' into aaron_mac

Conflicts:
	bin/data/LEVELS/level_1.xml