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

Alex committing changes
Merge branch 'master' into anthony

Conflicts:
	public/img-upload/2_profile.jpg