Merge pull request #30 from worldmentr/j-garcia-0788

J garcia 0788
Made some changes to the main page
Merge branch 'master' of github.com:worldmentr/capstone into pkuzma101

# By Donovan Becker (3) and James Garcia (2)
# Via James Garcia (5) and others
* 'master' of github.com:worldmentr/capstone:
  no message
  changed gitignore
  deleted node files that were accidentally added
  added mentor and mentee controllers
  Fixed logo in the navbar.

Conflicts:
	app/routes.php
Moved Mentors page to the mentors folder
Merge pull request #31 from worldmentr/j-garcia-0788

Edited logic in the nav bar.
Merge branch 'master' of github.com:worldmentr/capstone into pkuzma101

# By James Garcia
# Via James Garcia (1) and Paul Kuzma (1)
* 'master' of github.com:worldmentr/capstone:
  Edited logic in the nav bar.
Made a new route and home controller for the FAQ page.  Also fixed a bug on the main page and adjusted our CSS file accordingly
added user login validation
added chooseTitle function to HomeController
Merge pull request #32 from worldmentr/pkuzma101

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

# By pkuzma101 (3) and James Garcia (1)
# Via pkuzma101 (3) and others
* 'master' of github.com:worldmentr/capstone:
  Made a new route and home controller for the FAQ page.  Also fixed a bug on the main page and adjusted our CSS file accordingly
  Edited logic in the nav bar.
  Moved Mentors page to the mentors folder
  Made some changes to the main page

Conflicts:
	app/controllers/HomeController.php
Made the two title page and adjusted CSS accordingly
adjusted folder and index layout for mentors and mentees
Merge pull request #34 from worldmentr/pkuzma101

Made the two title page and adjusted CSS accordingly
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:
  Made the two title page and adjusted CSS accordingly
Merge pull request #33 from worldmentr/dbecker215

added user login validation
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788

Conflicts:
	app/views/index.blade.php