fixed mentors and mentees controllers
Merge branch 'master' of github.com:worldmentr/capstone into dbecker215

# Via James Garcia
* 'master' of github.com:worldmentr/capstone:
testing chat capabilities
Merge branch 'master' of github.com:worldmentr/capstone into dbecker215

# By James Garcia (2) and pkuzma101 (1)
# Via James Garcia (2) and others
* 'master' of github.com:worldmentr/capstone:
  The navbar is now collapsible.  Have not yet figured out how to change the color of the navbar options.
  Minor changes.
  Edited mentor div in index.
Fixed a bug with the nav bar
Changed the FAQ so it doesn't get messed up by the collapsible navbar
Put in an ending bracket
updated profiles pages
Merge pull request #69 from worldmentr/pkuzma101

Fixed a bug with the nav bar
Merge branch 'master' of github.com:worldmentr/capstone into dbecker215

# By pkuzma101
# Via Donovan becker (1) and pkuzma101 (1)
* 'master' of github.com:worldmentr/capstone:
  Put in an ending bracket
  Changed the FAQ so it doesn't get messed up by the collapsible navbar
  Fixed a bug with the nav bar
Redesigned the mentors index page to look like the girl's page
Merge pull request #70 from worldmentr/dbecker215

Dbecker215
Merge branch 'master' of github.com:worldmentr/capstone into pkuzma101

# By Donovan Becker
# Via Donovan Becker (3) and others
* 'master' of github.com:worldmentr/capstone:
  updated profiles pages
  testing chat capabilities
  fixed mentors and mentees controllers
fixed the mentor and mentee issues
Merge pull request #71 from worldmentr/pkuzma101

Redesigned the mentors index page to look like the girl's page
Merge branch 'master' of github.com:worldmentr/capstone into dbecker215

# By pkuzma101
# Via pkuzma101 (2) and others
* 'master' of github.com:worldmentr/capstone:
  Redesigned the mentors index page to look like the girl's page
Merge pull request #72 from worldmentr/dbecker215

Dbecker215
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788

Conflicts:
	app/views/mentors/edit.blade.php
	public/css/navbar.css