maxim's animation working, not including updated timer, attract mode now in menu screen still needs a little massage.
fixed bug
Merge commit '9240a6c7cd9f38f36e54937fd198e9fbfe8613b4' into aaron_mac

Conflicts:
	src/AudioHandler.cpp
	src/GameScreen.cpp
	src/GameScreen.h
	src/Model.cpp