add time line and take background back
git before merge new player
Merge branch 'master' of https://github.com/SmileZero/muse
merge to user_signup_login
merge new player
merge new player