new stuff
Merge branch 'master' of https://github.com/XJMa/ColorfulWorld
only thing i have left is letter stuff