fixing links
Merge branch 'master' into afalsario
adding search options
Merge branch 'master' into afalsario
Changed login blade to show a tab for Login/Signup
Merge pull request #31 from afalsario/alex

Alex committing changes
Merge branch 'master' into anthony

Conflicts:
	app/views/profile.blade.php
Merge pull request #32 from afalsario/anthony

Changed login blade to show a tab for Login/Signup
adding search functions for price, moved search bar
fixed merge conflicts
Merge pull request #34 from afalsario/afalsario

Afalsario
made login a modal and edited photo divs
Merge pull request #35 from afalsario/afalsario

made login a modal and edited photo divs
Fixed sizing with profile images