asdfghj
Merge remote-tracking branch 'origin/master'

Conflicts:
	Eric/Road-to-Diamond/ex1.19.c
Merge branch 'master' of https://github.com/Elenayatusabeh/Programacio-C