fixed search
Merge pull request #39 from afalsario/afalsario

fixed search
Merge branch 'master' into anthony

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