Merge branch 'master'

Conflicts:
	folder/conflictedFile.txt
