merge
work
Merge branch 'master', remote-tracking branch 'origin'
Merged new layout with the .gitignore push
Merged new layout with the .gitignore push