Sound op
Merge branch 'sfml-migration' of github.com:ioa42/ld30 into sfml-migration

Conflicts:
	Player.cpp