merging
Merge branch 'master' of github.com:supreme-committee/text-adventure
Merge branch 'master' of github.com:supreme-committee/text-adventure
Merge branch 'master' of github.com:supreme-committee/text-adventure
Merge branch 'master' of github.com:supreme-committee/text-adventure
Merge branch 'master' of github.com:supreme-committee/text-adventure
Merge branch 'master' of github.com:supreme-committee/text-adventure
Added -framwork SFML-audio to the frameworks list for the Mac makefilex