test
ignore us
diff
git rm
more diff details
git mv
git log
rm
Merge branch 'master' into underscore