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

Conflicts:
	app/views/partials/navbar.blade.php
	public/css/navbar.css
Merge pull request #72 from worldmentr/dbecker215

Dbecker215
Changed details in a few pages, apparently you don't need closing input tags as it wasn't closing some of the divs... the footer is still being a pain in my side. But it's getting there.
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788

Conflicts:
	app/views/mentors/edit.blade.php
	public/css/navbar.css
Merge pull request #73 from worldmentr/j-garcia-0788

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

# By James Garcia
# Via James Garcia (4) and Donovan becker (1)
* 'master' of github.com:worldmentr/capstone:
  Changed details in a few pages, apparently you don't need closing input tags as it wasn't closing some of the divs... the footer is still being a pain in my side. But it's getting there.
  no message