merge conflicts
Merge branch 'master' of github.com:joeyuan19/daily-salute
much update