redo
Merge branch 'master' of github.com:millesky87/Gamerproj into style_update
Merge pull request #24 from millesky87/style_update

Style update