small changes
Fixed sizing with profile images
Merge branch 'master' into afalsario
Merge pull request #37 from afalsario/afalsario

Afalsario
conflicts resolved
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
Merge branch 'master' into anthony

Conflicts:
	app/views/homepage.blade.php
	public/img-upload/2_profile.jpg