Button /work in progress)
Double commit?
Merge branch 'master' of https://github.com/flanr/Frogger

Conflicts:
	Frogger/Configuration
	Frogger/Configuration.backup
	Frogger/Frogger.vcxproj.filters
Fixed it.. i hope
Merge branch 'master' of https://github.com/flanr/Frogger