created default-env file and edited composer
created default-env
edited composer.lock file
Merge branch 'master' of github.com:worldmentr/capstone into dbecker215

Conflicts:
	composer.lock
my first commit
First draft of master.blade
First draft of navbar.blade
First draft of index.blade
Only navbar css is included at this point, bootstrap also being pushed
Pushing bootstrap and parallax scrolling JS files
First draft of the main page.  Will try to include testimonials on a bootstrap carousel
Added a new font
Added a carousel to the testimonials section of the main page
Merge pull request #2 from worldmentr/pkuzma101

added navbar, carousel, and front page
added Entrust, Confider, migrations
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:
  Added a carousel to the testimonials section of the main page
  Added a new font
  First draft of the main page.  Will try to include testimonials on a bootstrap carousel
  Pushing bootstrap and parallax scrolling JS files
  Only navbar css is included at this point, bootstrap also being pushed
  First draft of index.blade
  First draft of navbar.blade
  First draft of master.blade
  my first commit
Merge pull request #3 from worldmentr/dbecker215

Dbecker215