Merge origin/master
After stashing some working tree index.html content and an added (staged) stashme.html, pulling (and merging) small change from remote, and applying stash, then adding index.html, then committing.