Added new file
Create pull_develop_branch
added new file 2
Added some changes in readme file
Added some in mew_file
Merge branch 'develop'
commit after merge
Merge branch 'master' of github.com:bossi4ek/public into develop
Added gitigmore
Edited .gitignore
Merge branch 'master' of github.com:bossi4ek/public
Conflict