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
took out whitespace in code
Merge branch 'master' into anthony

Conflicts:
	app/views/edit_gallery.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
minor changes. moved edit profile button
Merge branch 'master' into alex
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
Merge pull request #27 from afalsario/afalsario

Afalsario
Edited navbar, added pagination, default image title for gallery.