zmiana mastera
master gitignore sdf
resolve conflicts
next commit