Merge branch 'develop'
Line no 2 added
Conflicting line added
First line changed in file4.txt from develop
new db directory
newfile.txt added
new file with timestamp
Merge branch 'master' of github.com:alfredolopez-kantox/project-example into develop