third edit
fourth edit in branch feather1
fourth edit b
conflict solved
added new file
added new file
Merge branch 'dev'