Agrego cambio de contraseñas
Merge branch 'master' of https://github.com/aalabarce/gdd-tp2014-1c
merge

Signed-off-by: Ariel Vila <ariel_fv92@hotmail.com>