konflikt
.gitignore
index
vwevw
Merge branch 'master' of https://github.com/dextroza/isocial