sdf
Merge branch 'master' of https://github.com/janjarfalk/drinkapp

Conflicts:
	drinkapp/templates/root.html