Added brief and description
Merge branch 'master' into game_programming