Edited Breweries controller, model and view. Added brewery_id to beers migration
Merge pull request #15 from MyLocalBeer/jasonb

Edited Breweries controller, model and view. Added brewery_id to beers m...
Updated users seeder to use the faker data and include default user as admin.
Merge pull request #16 from MyLocalBeer/jstaudt

Updated users seeder to use the faker data and include default user as a...
Updated User model to hash passwords.
Merge pull request #17 from MyLocalBeer/jstaudt

Updated User model to hash passwords.
Fixed login/logout. Added if statement to create option on navbar. Updated create users table to add remember token
Merge pull request #18 from MyLocalBeer/jasonb

Fixed login/logout. Added if statement to create option on navbar. Updat...
changed models and controllers to set up relationships
Merge pull request #19 from MyLocalBeer/jasonb

changed models and controllers to set up relationships
Added foreign_key_to_users_table migration. Edited Brewery model.
Merge pull request #20 from MyLocalBeer/jasonb

Added foreign_key_to_users_table migration. Edited Brewery model.
Added locations table, locations seeder, LocationsController, updated DataBaseSeeder, updated UsersTableSeeder, updated Beer model to reflect many to many relationship with Location model, created Location model, created migration using way generator, seeded db with faker.
Merge pull request #21 from MyLocalBeer/jstaudt

Added locations table, locations seeder, LocationsController, updated Da...
Merge branch 'master' into lizcole

Conflicts:
	app/views/partials/navbar.blade.php