fixing some issues with Windows SDL
Merge branch 'master' of https://github.com/mattschwartz/asg2

Conflicts:
	SoundEffect.cpp
	SoundEffect.h
	SoundManager.cpp
	SoundManager.h