I think r should be 5
Merge remote-tracking branch 'origin/master'

Conflicts:
	S&S.txt
Merge branch 'master' of https://github.com/scelmendorf/gittest
Merge branch 'master' of https://github.com/scelmendorf/gittest
Merge branch 'master' of https://github.com/scelmendorf/gittest