changed colors, fixed sizes, merging with social
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from seksenov/master

Colors and game merging with social