Migracion
Migracion
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/includes/foot.jade