django_study_blablablog (master branch) (new commit in master) <<<<<<< HEAD (something new in master) ======= (new from dev0) dev0