update
Merge branch 'dev' of github.com:obullo/demo_blog into dev
update
conflict
Merge branch 'dev' of github.com:obullo/demo_blog into dev
updates