adds Bourbon
adds Bourbon properly
adds Neat
adds Bitters
actually adds Bitters
makes the buttons orange
removes set height and width for cheerup containers
Merge branch 'bourbon' into kate

Conflicts:
	Gemfile