fixing jessca disaster
Merge remote-tracking branch 'origin/master'
arreglando about us
Merge remote-tracking branch 'origin/master'