following the template
Merge branch 'C4_Samy_createsHTML' of https://github.com/ndomar/megasoft-13 into C4_Samy_createsHTML

Conflicts:
	C4_Samy_profile.css
	C4_Samy_profile.html
	C4_Samy_profile.js
	name1.png
	name2.png