changed new-user.blade.php
Merge branch 'master' of github.com:MyLocalBeer/mylocalbeer into jasonb
Merge pull request #26 from MyLocalBeer/jstaudt

Changed the default location of the map to San Antonio and made the map ...
changed new-user.blade
Merge branch 'master' of github.com:MyLocalBeer/mylocalbeer into jasonb
Installed Confide and Entrust and created associated tables. Changed config files for Confide and Entrust.
Merge pull request #27 from MyLocalBeer/jasonb

Jasonb
Updated composer to match jasonb branch and fix any conflicts.