SUGGAR
Merge branch 'master' of github.com:hammeron-art/shoppinglist

Conflicts:
	index.html