Added a new folder and text file
Created a text document
Merge branch 'master' into S1