Merge pull request #18 from MyLocalBeer/jasonb

Fixed login/logout. Added if statement to create option on navbar. Updat...
Merge pull request #19 from MyLocalBeer/jasonb

changed models and controllers to set up relationships
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...
- Created CSS stylesheet and linked to master.blade
- Formatted design for hello.blade
- Added pics folder with corresponding pictures for the website
- Updated navbar to reflect design of page
- Started jquery on hello.blade to fade in information divs and to create navbar that switches 	   between solid and transparent
Merge branch 'master' into lizcole

Conflicts:
	app/views/partials/navbar.blade.php
Merge pull request #22 from MyLocalBeer/lizcole

Started CSS styling and design work
Added jquery to hello.blade for fading and scrolling effects. Still not working, need to talk with Isaac.
Also made changes to the stylesheet in correlation with the stylesheet.
Merge pull request #23 from MyLocalBeer/lizcole

Added jquery to master.blade
changed new-user.blade.php