New branch
Add new files
stashing
Merge branch 'feature12' into stash_branch