display friendly list of files
Merge remote-tracking branch 'origin/master'