SUGAR
Merge branch 'master' of https://github.com/jinyuanau/shoppinglist

Conflicts:
	index.html