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

Conflicts:
	app/views/index.blade.php
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788
Added the mentors index back in. Easy mistake.
Minor syntax change.
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788
Fixed a bug with the JS files
Merge pull request #37 from worldmentr/pkuzma101

Fixed a bug with the JS files
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788
Fixed a few errors in the index that were causing upsets.
Merge pull request #38 from worldmentr/j-garcia-0788

J garcia 0788
Merge branch 'master' of github.com:worldmentr/capstone into dbecker215

# By James Garcia (4) and pkuzma101 (1)
# Via James Garcia (6) and Donovan becker (1)
* 'master' of github.com:worldmentr/capstone:
  Fixed a few errors in the index that were causing upsets.
  Fixed a bug with the JS files
  Minor syntax change.
  Added the mentors index back in. Easy mistake.
  no message