new timer, shorter goal sound, updated xml generator so it's not backwards, fuck that timer though, right?, probably other stuff. I'm hungry.
Merge commit '41b92ef7cdd13f592c4f892082b002911fda7016' into aaron_mac

Conflicts:
	src/Constants.h
	src/GameScreen.cpp
	src/MenuScreen.cpp