pulled mike's tests
Merge branch 'master' of https://github.com/rkuhel/lost_tribes3
Merge branch 'master' of https://github.com/rkuhel/lost_tribes3

Conflicts:
	config/database.yml
starting cart show
beers displayed
nav bar added for devise, users can be admin
nav bar and admin added to for users