Field 1 rewrite V2.0 eletric boogaloo
Merge remote-tracking branch 'origin/shervin' into aaron_mac

Conflicts:
	Field1.xcodeproj/project.pbxproj
	bin/data/variables.xml
	libraries/of_v0.7.4_osx_release/addons/ofxBox2d/src/ofxBox2dBaseShape.h
	libraries/of_v0.7.4_osx_release/addons/ofxBox2d/src/ofxBox2dCircle.h
	libraries/of_v0.7.4_osx_release/addons/ofxBox2d/src/ofxBox2dRect.h
	src/Constants.h
	src/GameScreen.cpp
	src/GameScreen.h
	src/GameVariables.h
	src/Goal.cpp
	src/Goal.h
	src/Model.cpp
	src/Model.h
	src/Player.cpp
	src/Player.h
	src/SquareObstacle.cpp
	src/SquareObstacle.h
	src/collisionscorekeeper.cpp
	src/collisionscorekeeper.h