synched the three levels with new music, changed circles to white, added hide cursor by default, changed fade in time, tried to find the controller bug. didn't. very tired.
Merge branch 'master' of https://github.com/aefreedman/Field1 into dylan

Conflicts:
	src/CircleObstacle.cpp
	src/Constants.h
	src/MenuScreen.cpp
Merge branch 'aaron_mac' of https://github.com/aefreedman/Field1 into dylan
Merge commit '3b76aa0c75b117af3f569bb2ac234bf2a451789d' into dylan
added level four, made bgm random select
Merge commit '55da9168540d33f6f6792a8fa415cd1baefa4652' into dylan
adding level five schtuff, not done let.
still working on level 5. it's going to be a good one. Lots of circles.
premerge
Merge commit 'cdb53cd3b6ee7e0a9df258dc09f77e9a3387b452' into DylanNew

Conflicts:
	src/GameScreen.cpp
	src/GlobalCollisionListner.cpp
	src/Player.cpp
Merge branch 'dylan' into DylanNew

Conflicts:
	src/GameScreen.cpp