Fixed sizing with profile images
conflicts resolved
Merge pull request #36 from afalsario/alex

Alex committing changes