Git Tested
Puching
Pushed
Merge remote-tracking branch 'origin/master'

Conflicts:
	DirectoryCreated/NewFileCreated
New changes