S
Merge branch 'master' into CC

Conflicts:
	file1.txt
Merge pull request #5 from hippopo07/CC

Cc