Merge pull request #36 from afalsario/alex

Alex committing changes
changed search
Merge branch 'master' into afalsario
Merge pull request #38 from afalsario/afalsario

Afalsario
Fixed Layout for the edit profile page