sfr: Change 3
Merge branch 'master' of https://github.com/pascalgeiser/group_sfr_pge

Conflicts:
	sandro_1.txt