tested using images
Merge branch 'master' into anthony
Added search functionailty to image controller. Added create gallery and edit profile buttons to profile index blade
Merge branch 'master' into anthony
Merge pull request #23 from afalsario/afalsario

Afalsario
took out whitespace in code
Merge branch 'master' into anthony

Conflicts:
	app/views/edit_gallery.blade.php
	app/views/profiles_index.blade.php
Set up modal for editing items, may need ajax for saving
Merge pull request #25 from afalsario/afalsario

fixed dropzone
Merge branch 'master' into alex

Conflicts:
	app/views/profile.blade.php
	app/views/profiles_index.blade.php
Changed code in routes and gallery blade to show searched items
Merge branch 'master' into anthony

Conflicts:
	app/routes.php
	app/views/gallery.blade.php
changed route for image controller
Merge pull request #24 from afalsario/alex

Alex committing changes
Merge branch 'master' into anthony

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

Anthony
fixing small bugs
fixing merge conflicts