Caps FLOUR
Merge branch 'master' of https://github.com/mrdummy/shoppinglist

Conflicts:
	index.html