delete blog
Merge remote-tracking branch 'origin/dev' into dev_jo
update .gitignore
Merge remote-tracking branch 'origin/dev' into dev_jo
Add aboutController, and information files, prepare to do about page
update shop screen
Add data into db, can show on about us now
Merge branch 'dev_peace' into dev