Added basic circle obstacle; building out obstacle system
Color changes; updates to variables
Merge commit 'fb004259760924823c16313961ee79fb1af1c622' into dev

Conflicts:
	src/Player.cpp
Art and stuff
Visual updates
Merge branch 'dev' into aaron_mac

Conflicts:
	Field1.xcodeproj/project.pbxproj
	bin/data/ART/background.png
	src/GameScreen.cpp
	src/GameScreen.h
	src/GameVariables.h
	src/Player.cpp
	src/Player.h
	src/Screen.cpp