Fixed clang flags
Merge conflict resolved.
Merge branch 'master' of github.com:mogelbrod/HoboQuest