Merge pull request #3 from worldmentr/dbecker215

Dbecker215
Merge pull request #4 from worldmentr/dbecker215

Dbecker215
Edited env.php.
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788

Conflicts:
	app/routes.php
Put style.css in the master.blade
Put style.css in the master.blade
Added a search bar to the navbar.  Also added a space for the logo
Merge pull request #5 from worldmentr/j-garcia-0788

J garcia 0788
Merge pull request #6 from worldmentr/pkuzma101

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

# By pkuzma101 (3) and James Garcia (1)
# Via James Garcia (3) and others
* 'master' of github.com:worldmentr/capstone:
  Added a search bar to the navbar.  Also added a space for the logo
  Put style.css in the master.blade
  Put style.css in the master.blade
  Edited env.php.