Update zh.yml _ by Marslo
Update scss
Revert "ignore database.yml"

This reverts commit 8d680f1829731e7f0fb920c9596f77fc1c0745be.
app/controllers/application_controller.rb

fix the i18n nil locale
Merge branch 'master' of github.com:RorLaurentium/The1stMode
Merge branch 'master' of github.com:RorLaurentium/The1stMode