store styles
merge from ryan
massive merge
count associated with each beer in cart to update quantity
Merge branch 'master' of https://github.com/rkuhel/lost_tribes3

Conflicts:
	config/database.yml