colors again
Merge branch 'master' of https://github.com/sdzelman/2048-Game