changes
added new file
new file edited
next commit
Merge branch 'second'