consult added
Merge branch 'master' of github.com:GuangxianEDU/webpage
put database.yml back