no message
Added code but was not able to get the edit page to update the database with image paths or otherwise
Changed location of submit button
Recommitting the controllers and models for mentor and user
Can now upload images and change information in database for both mentors and mentees
Merge branch 'master' of github.com:worldmentr/capstone into pkuzma101

# By Donovan Becker
# Via Donovan Becker (2) and Paul Kuzma (1)
* 'master' of github.com:worldmentr/capstone:
  cleaned up the form for the edit pages in mentor and mentee
  testing chat

Conflicts:
	app/views/mentees/edit.blade.php
	app/views/mentors/edit.blade.php
Merge branch 'master' of github.com:worldmentr/capstone into pkuzma101

# By Donovan Becker
# Via Donovan Becker (1) and Paul Kuzma (1)
* 'master' of github.com:worldmentr/capstone:
  fixed merge conflicts with edit.blade.php for mentor and mentee
  fixed merge conflicts for mentee/edit.blade.php
  updated mentees form

Conflicts:
	app/controllers/UsersController.php
	app/views/mentees/edit.blade.php
	app/views/mentors/edit.blade.php
Merge pull request #46 from worldmentr/pkuzma101

Fixed some code with the carousel
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788

Conflicts:
	app/views/index.blade.php