Merge remote-tracking branch 'origin/friends' into branchtomergefriendsbranch

This ignores all log files
Merge branch 'branchtomergefriendsbranch'