Changed and simplified homepage layout
Merge branch 'master' into anthony
images adde during testing
Merge branch 'master' into anthony

Conflicts:
	app/views/homepage.blade.php
	public/img-upload/2_profile.jpg
Merge pull request #39 from afalsario/afalsario

fixed search
Fixed Layout for the edit profile page
conflicts resolved
Added contact email to profile blade
Merge branch 'master' into anthony

Conflicts:
	public/img-upload/3_profile.jpg
Merge pull request #40 from afalsario/alex

Alex committing changes
Merge branch 'master' into anthony

Conflicts:
	public/img-upload/2_profile.jpg
Merge pull request #41 from afalsario/anthony

Anthony