Fixed Layout for the edit profile page
conflicts resolved
Merge pull request #40 from afalsario/alex

Alex committing changes