Merge branches 'master', 'master', 'master', 'master' and 'master' of https://github.com/thaliacampolina/ADM_PROD
Merge branches 'master', 'master', 'master', 'master', 'master' and 'master' of https://github.com/thaliacampolina/ADM_PROD
modifying
commit
commit
\o
Merge branch 'master' of https://github.com/thaliacampolina/ADM_PROD

Conflicts:
	a.out