style
Merge branch 'master' of https://github.com/MariaFicca/coding-check-ins

Conflicts:
	code-check-in-5/code-check-in-5