test
bootstrap test
add show_page2 about bootstrap
add nginx config
add registration app
Merge branches 'master' and 'dev'

* master:

* dev:
  add registration app
  add nginx config
  add show_page2 about bootstrap
  bootstrap test
  test