Merge pull request #1 from strohmy/master

removed duplicate layout
Merge pull request #2 from strohmy/master

enabled editing drinks
Merge pull request #3 from strohmy/master

added comments system
Merge pull request #4 from strohmy/master

added notifications
Merge pull request #5 from strohmy/master

added 30 arbitrary drinks to fixtures
Add css file and base layout
Merge pull request #6 from strohmy/master

got pagination working, fixed subscription bug
Merge pull request #7 from strohmy/master

Added basic voting system and some readme text
minor UI changes, buttons
Merge remote-tracking branch 'upstream/master'

Conflicts:
	client/templates/drinks/drink_item.html
	client/templates/includes/header.html
fox issues with merging with origin_master
css and brand changes, blue and white theme
Some different CSS stuff
Merge pull request #9 from strohmy/master

added sort by most votes
Merge pull request #10 from strohmy/master

added active classes to nav buttons
resolved conflicts in header template
Merge branch 'wardgeis-master'