testing images for profiles
Merge branch 'master' into anthony
pulled in corrections to profile page
image magick to user model and profile model
Merge branch 'master' into anthony
do not merge to master...wroked on imagemagick
Merge branch 'master' into anthony

Conflicts:
	app/controllers/UsersController.php
	app/models/User.php
do not merge
Merge branch 'master' into anthony

Conflicts:
	app/controllers/UsersController.php
	app/models/Image.php
Merge branch 'master' into anthony
Merge pull request #17 from afalsario/alex

Pushing changes to the profile index
Merge branch 'master' into anthony
added <h> tags to the foreach loop that shows artist images in the profile blade. Added $ sign to edit_gallery blade.
Pics added during testing.
changed title to COMMON ART SA in master.blade
adding an admin controller for the admin dashboard
added a view for the dashboard
Commented out house img. in top nav bar and changed to display COMMON ART SA in the layout.master.blade
removed imagemagick route

removed imagemagick route
Merge pull request #18 from afalsario/anthony

Anthony
fixing merge conflicts
Merge pull request #19 from afalsario/afalsario

Afalsario