Removed -pedantic from C++ flags
Merge branch 'master' of github.com:mfichman/jogo