merge conflicts

backend/pytest.ini

 [pytest]
 minversion = 2.8
-testpaths = tracim
+testpaths = tracim_backend
 addopts = -s -v

frontend/src/css/Login.styl

         padding-left 45px
     &__btnsubmit
       display block
-      margin 0 auto
       border none
       width 150px
       background-color green