testing chat
Merge branch 'master' of github.com:worldmentr/capstone into dbecker215

# By James Garcia (3) and pkuzma101 (1)
# Via James Garcia (5) and others
* 'master' of github.com:worldmentr/capstone:
  Changed the order of username and name in the carousel.
  Edited routes and a bit of carousel form.
  Added Laravel code to index, show, and edit pages
  Added carousel feature. Updated the style to fit the carousel feature in style.css. Added mentor variable in HomeController and fixed the routes for HomeController.
cleaned up the form for the edit pages in mentor and mentee
Merge pull request #48 from worldmentr/dbecker215

Dbecker215
updated mentees form
fixed merge conflicts for mentee/edit.blade.php
fixed merge conflicts with edit.blade.php for mentor and mentee
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 pull request #49 from worldmentr/dbecker215

updated mentees form
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