Add css file and base layout
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
resolved conflicts in header template
Merge branch 'wardgeis-master'