Added colors
Merge branch 'master' of https://github.com/espacians-hakathon/game