Changed
Merge branch 'master' of https://github.com/DanielPhoenixNAP/Main

Conflicts:
	newFile.txt