init commit
stash
stasht
update
redo
Merge branch 'master' into smyck