created errors structure
created comments system
created comments system
Merge pull request #3 from strohmy/master

added comments system
created notifications system
moved notifications to right of sidebar and nested in conditional
Merge pull request #4 from strohmy/master

added notifications
added 30 arbitrary drinks to fixtures
Merge pull request #5 from strohmy/master

added 30 arbitrary drinks to fixtures
got pagination working, fixed subscription bug
Merge pull request #6 from strohmy/master

got pagination working, fixed subscription bug
created basic voting system
created empty readme
Merge pull request #7 from strohmy/master

Added basic voting system and some readme text
Merge remote-tracking branch 'upstream/master'

Conflicts:
	client/templates/drinks/drink_item.html
	client/templates/includes/header.html