testing track
merce
Merge branch 'develop' of github.com:42Zavattas/42Stack into develop

Conflicts:
	app/views/partials/user.html