Article update
Merge branch 'master'
api routes
Merge branch 'master' of https://github.com/hub387/bardo