better documentation
ignoring branch local
merge master