fix star bug
clean up
conflicts
Merge branch 'master' of https://github.com/Alchemist0823/BitGame
change titles