Initial commit to showcase the commit functionality of Git
Added another line to the document.
Merge branch '9e31dec2ffd35966bc763d4d6c0540d674add06c'

Conflicts:
	.gitignore
	content.docx