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 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
Merge pull request #32 from worldmentr/pkuzma101

Pkuzma101