Testing more
Merge branch 'master' of https://github.com/flanr/Frogger

Conflicts:
	Frogger/GlobalGameConfig.h
	Frogger/Menu.cpp
	Frogger/Menu.h
	Frogger/MenuState.cpp
	Frogger/MenuState.h
	Frogger/SoundManager.cpp