my changes
Merge remote-tracking branch 'origin/master' into registrationpage

Conflicts:
	profile.txt.txt