Include fixes
integrated timer, added score and timer to game screen in the middle.
Obstacle drawing; working on player controller
Player feel changes; pixel-to-meter scaling; object collision masks
scoreboard debugged, centered and pretty. Instruction text moved to where I think it belongs, but not tested. Need to remove it from game screen once it's properly placed.
Fixed background draw
Merge commit 'e39e5f00dbc52d658349b9fa5feeebef98818e0a' into aaron_mac

Conflicts:
	src/GameScreen.cpp
Player starting positions & resetting from level files; object size change in level file
Cleaning up some code
radius changes; collisions
Merge commit '272e19e46e0f6f1df546b0bba3d37b9e863cce45' into aaron_mac

Conflicts:
	src/GameScreen.cpp
	src/GameVariables.h
	src/Model.cpp
	src/Model.h
SCREEEEEENNNSHAAAAAKE
maxim's animation working, not including updated timer, attract mode now in menu screen still needs a little massage.
Small visual changes
fixed bug
Merge commit '9240a6c7cd9f38f36e54937fd198e9fbfe8613b4' into aaron_mac

Conflicts:
	src/AudioHandler.cpp
	src/GameScreen.cpp
	src/GameScreen.h
	src/Model.cpp
Gameplay changes
Setting up attract mode MVC
added prefs to git ignore
audio files and audio handler code