Fixed logo in the navbar.
Merge pull request #25 from worldmentr/pkuzma101

Pkuzma101
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788
added mentor and mentee controllers
Merge pull request #27 from worldmentr/pkuzma101

Streamlined jQuery code to make navbar fade in and out along with scroll...
Merge pull request #26 from worldmentr/j-garcia-0788

Fixed logo in the navbar.
deleted node files that were accidentally added
changed gitignore
Merge branch 'master' of github.com:worldmentr/capstone into dbecker215

# By pkuzma101 (7) and James Garcia (2)
# Via James Garcia (3) and others
* 'master' of github.com:worldmentr/capstone:
  Streamlined jQuery code to make navbar fade in and out along with scrolling
  Addition to the routes, contact and about.
  Established the route to the Contact Us page
  Fixed logo in the navbar.
  Corrected image links
  Added the link to the About Us page on the navbar
  Added links to the footer and some css/image additions to the navbar.
  Correction - first draft of the About Us page along with updated CSS file
  About Us page - first draft

Conflicts:
	app/routes.php
Merge pull request #29 from worldmentr/pkuzma101

Pkuzma101
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:
  First draft of mentors list.  Was unable to test to see how it works.
  First draft of FAQ page.  Also updated CSS file accordingly
Merge pull request #28 from worldmentr/dbecker215

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

Conflicts:
	app/routes.php
Merge pull request #30 from worldmentr/j-garcia-0788

J garcia 0788
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