Fix: merge conflict
Merge branch 'joanrm20-master'
Merge branch 'master' of https://github.com/grockit-test-prep/maua

Conflicts:
	src/index.html